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

Commit 41c31f31 authored by Lifeng Sun's avatar Lifeng Sun Committed by David S. Miller
Browse files

networking: inappropriate ioctl operation should return ENOTTY 

ioctl() calls against a socket with an inappropriate ioctl operation
are incorrectly returning EINVAL rather than ENOTTY:

  [ENOTTY]
      Inappropriate I/O control operation.

BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=33992



Signed-off-by: default avatarLifeng Sun <lifongsun@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 983960b1

net/core/dev.c

+3 −3
Original line number Diff line number Diff line
@@ -4773,7 +4773,7 @@ static int dev_ifsioc_locked(struct net *net, struct ifreq *ifr, unsigned int cm 
		 * is never reached

		 */

		WARN_ON(1);

		err = -EINVAL;

		err = -ENOTTY;

		break;



	}
@@ -5041,7 +5041,7 @@ int dev_ioctl(struct net *net, unsigned int cmd, void __user *arg) 
		/* Set the per device memory buffer space.

		 * Not applicable in our case */

	case SIOCSIFLINK:

		return -EINVAL;

		return -ENOTTY;



	/*

	 *	Unknown or private ioctl.
@@ -5062,7 +5062,7 @@ int dev_ioctl(struct net *net, unsigned int cmd, void __user *arg) 
		/* Take care of Wireless Extensions */

		if (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST)

			return wext_handle_ioctl(net, &ifr, cmd, arg);

		return -EINVAL;

		return -ENOTTY;

	}

}