Skip to content

Commit

Permalink
wext: Pull ioctl permission checking out into helper function.
Browse files Browse the repository at this point in the history
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller authored and David S. Miller committed Jun 17, 2008
1 parent d88174e commit 67dd760
Showing 1 changed file with 15 additions and 7 deletions.
22 changes: 15 additions & 7 deletions net/wireless/wext.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 67dd760

Please sign in to comment.