[PATCH 11/15] userns: make some net-sysfs capable calls targeted
flat view
STALE5495d
From: Serge Hallyn <hidden>
Date: 2011-09-02 19:57:46
Also in:
lkml
Subsystem:
networking [general], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From: "Serge E. Hallyn" <redacted> Changelog: jul 1: fix compilation errors (net_device != net) Signed-off-by: Serge E. Hallyn <redacted> Cc: Eric W. Biederman <ebiederm-aS9lmoZGLiVWk0Htik3J/w@public.gmane.org> --- 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 1683e5d..876915b 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 */
--
1.7.5.4