diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-11-15 22:03:07 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-11-18 20:32:45 -0500 |
commit | df008c91f83583e662ac54aee00004afc3f1894d (patch) | |
tree | 800fd831c5beb1c4ec00b41d270462d52973a425 /net/key | |
parent | af31f412c7c7a3c0fda4bf4beaf0c85af1f263c8 (diff) |
net: Allow userns root to control llc, netfilter, netlink, packet, and xfrm
Allow an unpriviled user who has created a user namespace, and then
created a network namespace to effectively use the new network
namespace, by reducing capable(CAP_NET_ADMIN) and
capable(CAP_NET_RAW) calls to be ns_capable(net->user_ns,
CAP_NET_ADMIN), or capable(net->user_ns, CAP_NET_RAW) calls.
Allow creation of af_key sockets.
Allow creation of llc sockets.
Allow creation of af_packet sockets.
Allow sending xfrm netlink control messages.
Allow binding to netlink multicast groups.
Allow sending to netlink multicast groups.
Allow adding and dropping netlink multicast groups.
Allow sending to all netlink multicast groups and port ids.
Allow reading the netfilter SO_IP_SET socket option.
Allow sending netfilter netlink messages.
Allow setting and getting ip_vs netfilter socket options.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/key')
-rw-r--r-- | net/key/af_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index 08897a3c7ec7..5b426a646544 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
@@ -141,7 +141,7 @@ static int pfkey_create(struct net *net, struct socket *sock, int protocol, | |||
141 | struct sock *sk; | 141 | struct sock *sk; |
142 | int err; | 142 | int err; |
143 | 143 | ||
144 | if (!capable(CAP_NET_ADMIN)) | 144 | if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) |
145 | return -EPERM; | 145 | return -EPERM; |
146 | if (sock->type != SOCK_RAW) | 146 | if (sock->type != SOCK_RAW) |
147 | return -ESOCKTNOSUPPORT; | 147 | return -ESOCKTNOSUPPORT; |