Commit d806b731 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Greg Kroah-Hartman

netlink: Rename netlink_capable netlink_allowed

[ Upstream commit 5187cd05 ]

netlink_capable is a static internal function in af_netlink.c and we
have better uses for the name netlink_capable.
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bb7f9e5c
...@@ -1219,7 +1219,7 @@ static int netlink_autobind(struct socket *sock) ...@@ -1219,7 +1219,7 @@ static int netlink_autobind(struct socket *sock)
return err; 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) || return (nl_table[sock->sk->sk_protocol].flags & flag) ||
ns_capable(sock_net(sock->sk)->user_ns, CAP_NET_ADMIN); ns_capable(sock_net(sock->sk)->user_ns, CAP_NET_ADMIN);
...@@ -1287,7 +1287,7 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr, ...@@ -1287,7 +1287,7 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr,
/* Only superuser is allowed to listen multicasts */ /* Only superuser is allowed to listen multicasts */
if (nladdr->nl_groups) { if (nladdr->nl_groups) {
if (!netlink_capable(sock, NL_CFG_F_NONROOT_RECV)) if (!netlink_allowed(sock, NL_CFG_F_NONROOT_RECV))
return -EPERM; return -EPERM;
err = netlink_realloc_groups(sk); err = netlink_realloc_groups(sk);
if (err) if (err)
...@@ -1349,7 +1349,7 @@ static int netlink_connect(struct socket *sock, struct sockaddr *addr, ...@@ -1349,7 +1349,7 @@ static int netlink_connect(struct socket *sock, struct sockaddr *addr,
return -EINVAL; return -EINVAL;
/* Only superuser is allowed to send multicasts */ /* 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; return -EPERM;
if (!nlk->portid) if (!nlk->portid)
...@@ -1921,7 +1921,7 @@ static int netlink_setsockopt(struct socket *sock, int level, int optname, ...@@ -1921,7 +1921,7 @@ static int netlink_setsockopt(struct socket *sock, int level, int optname,
break; break;
case NETLINK_ADD_MEMBERSHIP: case NETLINK_ADD_MEMBERSHIP:
case NETLINK_DROP_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; return -EPERM;
err = netlink_realloc_groups(sk); err = netlink_realloc_groups(sk);
if (err) if (err)
...@@ -2072,7 +2072,7 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock, ...@@ -2072,7 +2072,7 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock,
dst_group = ffs(addr->nl_groups); dst_group = ffs(addr->nl_groups);
err = -EPERM; err = -EPERM;
if ((dst_group || dst_portid) && if ((dst_group || dst_portid) &&
!netlink_capable(sock, NL_CFG_F_NONROOT_SEND)) !netlink_allowed(sock, NL_CFG_F_NONROOT_SEND))
goto out; goto out;
} else { } else {
dst_portid = nlk->dst_portid; dst_portid = nlk->dst_portid;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment