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

netns: bond: allow unprivileged users to control bond device

Browse Source 
reduce the permission check of bond device's ioctl.
allow the userns root to control the bond device.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Gao feng
2013-01-31 16:31:00 +00:00
committed by David S. Miller
parent e4d343ea92
commit 387ff91184
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/bonding/bond_main.c
View File

@@ -3612,6 +3612,7 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
struct ifslave k_sinfo; struct ifslave k_sinfo;
struct ifslave __user *u_sinfo = NULL; struct ifslave __user *u_sinfo = NULL;
struct mii_ioctl_data *mii = NULL; struct mii_ioctl_data *mii = NULL;
struct net *net;
int res = 0; int res = 0;
pr_debug("bond_ioctl: master=%s, cmd=%d\n", bond_dev->name, cmd); pr_debug("bond_ioctl: master=%s, cmd=%d\n", bond_dev->name, cmd);
@@ -3678,10 +3679,12 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd
break; break;
} }
if (!capable(CAP_NET_ADMIN)) net = dev_net(bond_dev);
if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
return -EPERM; return -EPERM;
slave_dev = dev_get_by_name(dev_net(bond_dev), ifr->ifr_slave); slave_dev = dev_get_by_name(net, ifr->ifr_slave);
pr_debug("slave_dev=%p:\n", slave_dev); pr_debug("slave_dev=%p:\n", slave_dev);