lkml.org 
[lkml]   [2011]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/14] userns: make some net-sysfs capable calls targeted
    Date
    From: Serge E. Hallyn <serge.hallyn@canonical.com>

    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>
    ---
    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.4.1


    \
     
     \ /
      Last update: 2011-07-26 21:03    [W:0.020 / U:29.664 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site