diff options
| author | Serge E. Hallyn <serge.hallyn@canonical.com> | 2011-07-26 18:58:34 +0000 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@aristanetworks.com> | 2011-08-11 10:07:52 -0500 |
| commit | bba0e29815037647f1eba880ffaedf3546df4548 (patch) | |
| tree | 87243687aa268338296ba653b79151ba737de2e5 | |
| parent | 27ede6b60ccee337d702c7fe8eea311495391df7 (diff) | |
| download | linux-user-ns-devel-bba0e29815037647f1eba880ffaedf3546df4548.tar.gz | |
userns: make some net-sysfs capable calls targeted
Changelog: jul 1: fix compilation errors (net_device != net)
Signed-off-by: Serge E. Hallyn <serge.hallyn@canonical.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
| -rw-r--r-- | net/core/net-sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 1683e5db2f276..876915b0c381f 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -76,7 +76,7 @@ static ssize_t netdev_store(struct device *dev, struct device_attribute *attr, unsigned long new; int ret = -EINVAL; - if (!capable(CAP_NET_ADMIN)) + if (!ns_capable(dev_net(net)->user_ns, CAP_NET_ADMIN)) return -EPERM; new = simple_strtoul(buf, &endp, 0); @@ -261,7 +261,7 @@ static ssize_t store_ifalias(struct device *dev, struct device_attribute *attr, size_t count = len; ssize_t ret; - if (!capable(CAP_NET_ADMIN)) + if (!ns_capable(dev_net(netdev)->user_ns, CAP_NET_ADMIN)) return -EPERM; /* ignore trailing newline */ |