lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[netdrvr] tehuti: move ioctl perm check closer to function start

Browse Source 
Noticed by davem.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Jeff Garzik
2008-04-25 03:11:31 -04:00
committed by Jeff Garzik
parent d4f73c8e45
commit f946dffed6
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/tehuti.c
View File

@@ -649,6 +649,9 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd)
DBG("%d 0x%x 0x%x\n", data[0], data[1], data[2]); DBG("%d 0x%x 0x%x\n", data[0], data[1], data[2]);
} }
if (!capable(CAP_NET_ADMIN))
return -EPERM;
switch (data[0]) { switch (data[0]) {
case BDX_OP_READ: case BDX_OP_READ:
@@ -664,8 +667,6 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd)
break; break;
case BDX_OP_WRITE: case BDX_OP_WRITE:
if (!capable(CAP_NET_ADMIN))
return -EPERM;
error = bdx_range_check(priv, data[1]); error = bdx_range_check(priv, data[1]);
if (error < 0) if (error < 0)
return error; return error;