Skip to contentSkip to conversation

can: fix ioctl function removal

PATCH In review Oliver Hartkopp 1 participant 2 messages Jul 30, 2019

Subsystems (4)
lore
Share & tools
lore

Oliver Hartkopp

author maintainer
#0 lore raw

PATCH v2 1/1 can: fix ioctl function removal

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.

Fixes 60649d4e0af6c26b ("can: remove obsolete empty ioctl() handler")

---

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(-)
net/can/bcm.c +8 -1
index 8da986b19d88..bf1d0bbecec8 100644
@@ -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
index ff720272f7b7..da386f1fa815 100644
@@ -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,
Signature · 1 line
2.20.1
author maintainer
#1 lore raw

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

Quoted 76 lines · Oliver Hartkopp

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.

Fixes 60649d4e0af6c26b ("can: remove obsolete empty ioctl() handler")

---

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(-)
net/can/bcm.c +8 -1
index 8da986b19d88..bf1d0bbecec8 100644
@@ -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
index ff720272f7b7..da386f1fa815 100644
@@ -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,