Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 473d924d authored by Oliver Hartkopp's avatar Oliver Hartkopp Committed by David S. Miller
Browse files

can: fix ioctl function removal 



Commit 60649d4e ("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: default avatarkernel test robot <rong.a.chen@intel.com>
Fixes: 60649d4e ("can: remove obsolete empty ioctl() handler")
Signed-off-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1cb9dfca

net/can/bcm.c

+8 −1
Original line number Diff line number Diff line
@@ -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,

net/can/raw.c

+8 −1
Original line number Diff line number Diff line
@@ -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,