aboutsummaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorAl Viro2017-10-01 20:13:08 -0400
committerAl Viro2018-01-24 19:13:45 -0500
commitb1b0c245067268043e0e832432f3d537a5cae33b (patch)
tree7ded461ec00dc15af031544a1c5e8bbb3586902d /net/core
parent4cf808e7ac32120b3db95d824acd52f586bfdd1d (diff)
lift handling of SIOCIW... out of dev_ioctl()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev_ioctl.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
index 5cdec23dd28e..d262f159f9fd 100644
--- a/net/core/dev_ioctl.c
+++ b/net/core/dev_ioctl.c
@@ -411,24 +411,6 @@ int dev_ioctl(struct net *net, unsigned int cmd, void __user *arg)
if (cmd == SIOCGIFNAME)
return dev_ifname(net, (struct ifreq __user *)arg);
- /*
- * Take care of Wireless Extensions. Unfortunately struct iwreq
- * isn't a proper subset of struct ifreq (it's 8 byte shorter)
- * so we need to treat it specially, otherwise applications may
- * fault if the struct they're passing happens to land at the
- * end of a mapped page.
- */
- if (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) {
- struct iwreq iwr;
-
- if (copy_from_user(&iwr, arg, sizeof(iwr)))
- return -EFAULT;
-
- iwr.ifr_name[sizeof(iwr.ifr_name) - 1] = 0;
-
- return wext_handle_ioctl(net, &iwr, cmd, arg);
- }
-
if (copy_from_user(&ifr, arg, sizeof(struct ifreq)))
return -EFAULT;