diff options
| author | Jeff Garzik <jeff@garzik.org> | 2008-04-25 03:11:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-25 03:11:31 -0400 |
| commit | f946dffed6334f08da065a89ed65026ebf8b33b4 (patch) | |
| tree | 64751c19f951f9c5e4df443337a1194e24481155 /drivers/net/tehuti.c | |
| parent | d4f73c8e459d355e10051174d859ffd0ef5764c0 (diff) | |
| download | blackbird-op-linux-f946dffed6334f08da065a89ed65026ebf8b33b4.tar.gz blackbird-op-linux-f946dffed6334f08da065a89ed65026ebf8b33b4.zip | |
[netdrvr] tehuti: move ioctl perm check closer to function start
Noticed by davem.
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/tehuti.c')
| -rw-r--r-- | drivers/net/tehuti.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c index d2e1b219673d..e83b166aa6b9 100644 --- a/drivers/net/tehuti.c +++ b/drivers/net/tehuti.c @@ -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]); } + if (!capable(CAP_NET_ADMIN)) + return -EPERM; + switch (data[0]) { case BDX_OP_READ: @@ -664,8 +667,6 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd) break; case BDX_OP_WRITE: - if (!capable(CAP_NET_ADMIN)) - return -EPERM; error = bdx_range_check(priv, data[1]); if (error < 0) return error; |
