diff options
| author | Thomas Graf <tgraf@suug.ch> | 2006-01-24 12:46:33 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-01-24 12:46:33 -0800 |
| commit | cabcac0b296cd9683bc168d60839729b720dc2b7 (patch) | |
| tree | 1a2fceecc809777db89b58ee4c927f87ceeb5969 /net | |
| parent | 8798b3fb714477f5c88dde102c149d2b3e1d8def (diff) | |
| download | linux-3.10-cabcac0b296cd9683bc168d60839729b720dc2b7.tar.gz linux-3.10-cabcac0b296cd9683bc168d60839729b720dc2b7.tar.bz2 linux-3.10-cabcac0b296cd9683bc168d60839729b720dc2b7.zip | |
[BONDING]: Remove CAP_NET_ADMIN requirement for INFOQUERY ioctl
This information is already available via /proc/net/bonding/*
therefore it doesn't make sense to require CAP_NET_ADMIN
privileges.
Original patch by Laurent Deniel <laurent.deniel@free.fr>
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index fd070a098f2..ffb82073056 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2543,13 +2543,14 @@ int dev_ioctl(unsigned int cmd, void __user *arg) case SIOCBONDENSLAVE: case SIOCBONDRELEASE: case SIOCBONDSETHWADDR: - case SIOCBONDSLAVEINFOQUERY: - case SIOCBONDINFOQUERY: case SIOCBONDCHANGEACTIVE: case SIOCBRADDIF: case SIOCBRDELIF: if (!capable(CAP_NET_ADMIN)) return -EPERM; + /* fall through */ + case SIOCBONDSLAVEINFOQUERY: + case SIOCBONDINFOQUERY: dev_load(ifr.ifr_name); rtnl_lock(); ret = dev_ifsioc(&ifr, cmd); |