lkml.org 
[lkml]   [2014]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 132/198] netlink: Rename netlink_capable netlink_allowed
    Date
    3.11.10.13 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: "Eric W. Biederman" <ebiederm@xmission.com>

    commit 5187cd055b6e81fc6526109456f8b20623148d5f upstream.

    netlink_capable is a static internal function in af_netlink.c and we
    have better uses for the name netlink_capable.

    Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    [ luis: backported to 3.11: used davem's backport for 3.10 ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    net/netlink/af_netlink.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
    index 90b654b45876..114a20aa6294 100644
    --- a/net/netlink/af_netlink.c
    +++ b/net/netlink/af_netlink.c
    @@ -1334,7 +1334,7 @@ retry:
    return err;
    }

    -static inline int netlink_capable(const struct socket *sock, unsigned int flag)
    +static inline int netlink_allowed(const struct socket *sock, unsigned int flag)
    {
    return (nl_table[sock->sk->sk_protocol].flags & flag) ||
    ns_capable(sock_net(sock->sk)->user_ns, CAP_NET_ADMIN);
    @@ -1402,7 +1402,7 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr,

    /* Only superuser is allowed to listen multicasts */
    if (nladdr->nl_groups) {
    - if (!netlink_capable(sock, NL_CFG_F_NONROOT_RECV))
    + if (!netlink_allowed(sock, NL_CFG_F_NONROOT_RECV))
    return -EPERM;
    err = netlink_realloc_groups(sk);
    if (err)
    @@ -1464,7 +1464,7 @@ static int netlink_connect(struct socket *sock, struct sockaddr *addr,
    return -EINVAL;

    /* Only superuser is allowed to send multicasts */
    - if (nladdr->nl_groups && !netlink_capable(sock, NL_CFG_F_NONROOT_SEND))
    + if (nladdr->nl_groups && !netlink_allowed(sock, NL_CFG_F_NONROOT_SEND))
    return -EPERM;

    if (!nlk->portid)
    @@ -2070,7 +2070,7 @@ static int netlink_setsockopt(struct socket *sock, int level, int optname,
    break;
    case NETLINK_ADD_MEMBERSHIP:
    case NETLINK_DROP_MEMBERSHIP: {
    - if (!netlink_capable(sock, NL_CFG_F_NONROOT_RECV))
    + if (!netlink_allowed(sock, NL_CFG_F_NONROOT_RECV))
    return -EPERM;
    err = netlink_realloc_groups(sk);
    if (err)
    @@ -2221,7 +2221,7 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock,
    dst_group = ffs(addr->nl_groups);
    err = -EPERM;
    if ((dst_group || dst_portid) &&
    - !netlink_capable(sock, NL_CFG_F_NONROOT_SEND))
    + !netlink_allowed(sock, NL_CFG_F_NONROOT_SEND))
    goto out;
    } else {
    dst_portid = nlk->dst_portid;
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-07-03 12:41    [W:4.043 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site