lift handling of SIOCIW... out of dev_ioctl()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/include/net/wext.h b/include/net/wext.h
index e51f067fdb3a00c56a3c477e30b7c28280abdc32..aa192a6703048487c92b0bbd496bf3359403edc9 100644 (file)
--- a/include/net/wext.h
+++ b/include/net/wext.h
@@ -7,7 +7,7 @@
 struct net;
 
 #ifdef CONFIG_WEXT_CORE
-int wext_handle_ioctl(struct net *net, struct iwreq *iwr, unsigned int cmd,
+int wext_handle_ioctl(struct net *net, unsigned int cmd,
                      void __user *arg);
 int compat_wext_handle_ioctl(struct net *net, unsigned int cmd,
                             unsigned long arg);
@@ -15,7 +15,7 @@ int compat_wext_handle_ioctl(struct net *net, unsigned int cmd,
 struct iw_statistics *get_wireless_stats(struct net_device *dev);
 int call_commit_handler(struct net_device *dev);
 #else
-static inline int wext_handle_ioctl(struct net *net, struct iwreq *iwr, unsigned int cmd,
+static inline int wext_handle_ioctl(struct net *net, unsigned int cmd,
                                    void __user *arg)
 {
        return -EINVAL;

diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
index 5cdec23dd28e791d0c3af77e1a06b2e8f1a473d9..d262f159f9fd5a80db0c7785926a87346a681b56 100644 (file)
--- 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;
 

diff --git a/net/socket.c b/net/socket.c
index 026271ff2853a2ff2086d26b47675ce2ba111dc8..1ad02d9edbef80d5747e4e753e86715048fe7e4e 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -1005,7 +1005,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
        } else
 #ifdef CONFIG_WEXT_CORE
        if (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) {
-               err = dev_ioctl(net, cmd, argp);
+               err = wext_handle_ioctl(net, cmd, argp);
        } else
 #endif
                switch (cmd) {

diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
index 6cdb054484d66d40e4523965457a619bd1c9154f..9efbfc753347bfeac4793111806036c97aaa6435 100644 (file)
--- a/net/wireless/wext-core.c
+++ b/net/wireless/wext-core.c
@@ -1035,18 +1035,23 @@ static int ioctl_standard_call(struct net_device *      dev,
 }
 
 
-int wext_handle_ioctl(struct net *net, struct iwreq *iwr, unsigned int cmd,
-                     void __user *arg)
+int wext_handle_ioctl(struct net *net, unsigned int cmd, void __user *arg)
 {
        struct iw_request_info info = { .cmd = cmd, .flags = 0 };
+       struct iwreq iwr;
        int ret;
 
-       ret = wext_ioctl_dispatch(net, iwr, cmd, &info,
+       if (copy_from_user(&iwr, arg, sizeof(iwr)))
+               return -EFAULT;
+
+       iwr.ifr_name[sizeof(iwr.ifr_name) - 1] = 0;
+
+       ret = wext_ioctl_dispatch(net, &iwr, cmd, &info,
                                  ioctl_standard_call,
                                  ioctl_private_call);
        if (ret >= 0 &&
            IW_IS_GET(cmd) &&
-           copy_to_user(arg, iwr, sizeof(struct iwreq)))
+           copy_to_user(arg, &iwr, sizeof(struct iwreq)))
                return -EFAULT;
 
        return ret;