diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2019-07-29 22:40:56 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-29 14:12:35 -0700 |
| commit | 473d924d7d46cb57aa4c1863261d18366af345af (patch) | |
| tree | 797f90f9d80608f7e7175511617de44ecdc7fbea | |
| parent | 1cb9dfca39eb406960f8f84864ddd6ba329ec321 (diff) | |
| download | linux-stable-473d924d7d46cb57aa4c1863261d18366af345af.tar.gz linux-stable-473d924d7d46cb57aa4c1863261d18366af345af.tar.bz2 linux-stable-473d924d7d46cb57aa4c1863261d18366af345af.zip | |
can: fix ioctl function removal
Commit 60649d4e0af ("can: remove obsolete empty ioctl() handler") replaced the
almost empty can_ioctl() function with sock_no_ioctl() which always returns
-EOPNOTSUPP.
Even though we don't have any ioctl() functions on socket/network layer we need
to return -ENOIOCTLCMD to be able to forward ioctl commands like SIOCGIFINDEX
to the network driver layer.
This patch fixes the wrong return codes in the CAN network layer protocols.
Reported-by: kernel test robot <rong.a.chen@intel.com>
Fixes: 60649d4e0af ("can: remove obsolete empty ioctl() handler")
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/can/bcm.c | 9 | ||||
| -rw-r--r-- | net/can/raw.c | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/net/can/bcm.c b/net/can/bcm.c index 8da986b19d88..bf1d0bbecec8 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -1680,6 +1680,13 @@ static int bcm_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, return size; } +int bcm_sock_no_ioctlcmd(struct socket *sock, unsigned int cmd, + unsigned long arg) +{ + /* no ioctls for socket layer -> hand it down to NIC layer */ + return -ENOIOCTLCMD; +} + static const struct proto_ops bcm_ops = { .family = PF_CAN, .release = bcm_release, @@ -1689,7 +1696,7 @@ static const struct proto_ops bcm_ops = { .accept = sock_no_accept, .getname = sock_no_getname, .poll = datagram_poll, - .ioctl = sock_no_ioctl, + .ioctl = bcm_sock_no_ioctlcmd, .gettstamp = sock_gettstamp, .listen = sock_no_listen, .shutdown = sock_no_shutdown, diff --git a/net/can/raw.c b/net/can/raw.c index ff720272f7b7..da386f1fa815 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -837,6 +837,13 @@ static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, return size; } +int raw_sock_no_ioctlcmd(struct socket *sock, unsigned int cmd, + unsigned long arg) +{ + /* no ioctls for socket layer -> hand it down to NIC layer */ + return -ENOIOCTLCMD; +} + static const struct proto_ops raw_ops = { .family = PF_CAN, .release = raw_release, @@ -846,7 +853,7 @@ static const struct proto_ops raw_ops = { .accept = sock_no_accept, .getname = raw_getname, .poll = datagram_poll, - .ioctl = sock_no_ioctl, + .ioctl = raw_sock_no_ioctlcmd, .gettstamp = sock_gettstamp, .listen = sock_no_listen, .shutdown = sock_no_shutdown, |