projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netlink: Rename netlink_capable netlink_allowed
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
net
/
netlink
/
af_netlink.c
diff --git
a/net/netlink/af_netlink.c
b/net/netlink/af_netlink.c
index c9c2a8441d32d70b26979850951e66d0888bc09e..3f1d67e7cf5bdb43e1cf61f4b4e168d39ebd3725 100644
(file)
--- a/
net/netlink/af_netlink.c
+++ b/
net/netlink/af_netlink.c
@@
-1219,7
+1219,7
@@
retry:
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) ||
ns_capable(sock_net(sock->sk)->user_ns, CAP_NET_ADMIN);
{
return (nl_table[sock->sk->sk_protocol].flags & flag) ||
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,
/* Only superuser is allowed to listen multicasts */
if (nladdr->nl_groups) {
/* 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)
return -EPERM;
err = netlink_realloc_groups(sk);
if (err)
@@
-1349,7
+1349,7
@@
static int netlink_connect(struct socket *sock, struct sockaddr *addr,
return -EINVAL;
/* Only superuser is allowed to send multicasts */
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)
return -EPERM;
if (!nlk->portid)
@@
-1921,7
+1921,7
@@
static int netlink_setsockopt(struct socket *sock, int level, int optname,
break;
case NETLINK_ADD_MEMBERSHIP:
case NETLINK_DROP_MEMBERSHIP: {
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)
return -EPERM;
err = netlink_realloc_groups(sk);
if (err)
@@
-2072,7
+2072,7
@@
static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock,
dst_group = ffs(addr->nl_groups);
err = -EPERM;
if ((dst_group || dst_portid) &&
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;
goto out;
} else {
dst_portid = nlk->dst_portid;