wext: Pull ioctl permission checking out into helper function.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/wireless/wext.c b/net/wireless/wext.c
index a1cd19add6d8a9642eba9d5895a1ef11a8f00127..e96559ea0fb345e7c882c168a01dcfd98831839d 100644 (file)
--- a/net/wireless/wext.c
+++ b/net/wireless/wext.c
@@ -1061,18 +1061,26 @@ static int wireless_process_ioctl(struct net *net, struct ifreq *ifr, unsigned i
        return -EOPNOTSUPP;
 }
 
+/* If command is `set a parameter', or `get the encoding parameters',
+ * check if the user has the right to do it.
+ */
+static int wext_permission_check(unsigned int cmd)
+{
+       if ((IW_IS_SET(cmd) || cmd == SIOCGIWENCODE || cmd == SIOCGIWENCODEEXT)
+           && !capable(CAP_NET_ADMIN))
+               return -EPERM;
+
+       return 0;
+}
+
 /* entry point from dev ioctl */
 int wext_handle_ioctl(struct net *net, struct ifreq *ifr, unsigned int cmd,
                      void __user *arg)
 {
-       int ret;
+       int ret = wext_permission_check(cmd);
 
-       /* If command is `set a parameter', or
-        * `get the encoding parameters', check if
-        * the user has the right to do it */
-       if ((IW_IS_SET(cmd) || cmd == SIOCGIWENCODE || cmd == SIOCGIWENCODEEXT)
-           && !capable(CAP_NET_ADMIN))
-               return -EPERM;
+       if (ret)
+               return ret;
 
        dev_load(net, ifr->ifr_name);
        rtnl_lock();