[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <7aa4fcc3-893b-7251-f305-80f8930e9da6@hartkopp.net>
Date: Tue, 30 Jul 2019 08:48:05 +0200
From: Oliver Hartkopp <socketcan@...tkopp.net>
To: davem@...emloft.net, netdev@...r.kernel.org
Cc: linux-can@...r.kernel.org, sfr@...b.auug.org.au,
kernel test robot <rong.a.chen@...el.com>,
Marc Kleine-Budde <mkl@...gutronix.de>
Subject: Re: [PATCH net-next v2] can: fix ioctl function removal
According to Marc the original patch has already been applied by Dave.
https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git/commit/?id=473d924d7d46cb57aa4c1863261d18366af345af
Thanks for the support & sorry for the noise!
Best regards,
Oliver
On 30/07/2019 08.43, Oliver Hartkopp wrote:
> Commit 60649d4e0af6c26b ("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@...el.com>
> Fixes: 60649d4e0af6c26b ("can: remove obsolete empty ioctl() handler")
> Signed-off-by: Oliver Hartkopp <socketcan@...tkopp.net>
> ---
>
> v2: Changed SHA1 tag to be a least 12 digits long
>
> net/can/bcm.c | 9 ++++++++-
> 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,
>
Powered by blists - more mailing lists