aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-11-15 22:03:11 -0500
committerDavid S. Miller <davem@davemloft.net>2012-11-18 20:33:36 -0500
commitb51642f6d77b131dc85d1d71029c3cbb5b07c262 (patch)
tree0f3feb16dad1cd729dff368396ee90cd424797a1 /net/ipv6
parentc027aab4a6b1fe2541090ac04bee8ad246aeef70 (diff)
net: Enable a userns root rtnl calls that are safe for unprivilged users
- Only allow moving network devices to network namespaces you have CAP_NET_ADMIN privileges over. - Enable creating/deleting/modifying interfaces - Enable adding/deleting addresses - Enable adding/setting/deleting neighbour entries - Enable adding/removing routes - Enable adding/removing fib rules - Enable setting the forwarding state - Enable adding/removing ipv6 address labels - Enable setting bridge parameter Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/addrconf.c6
-rw-r--r--net/ipv6/addrlabel.c3
-rw-r--r--net/ipv6/route.c6
3 files changed, 0 insertions, 15 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index d39fe490da08..fc0e13ad6337 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -3514,9 +3514,6 @@ inet6_rtm_deladdr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
3514 struct in6_addr *pfx; 3514 struct in6_addr *pfx;
3515 int err; 3515 int err;
3516 3516
3517 if (!capable(CAP_NET_ADMIN))
3518 return -EPERM;
3519
3520 err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv6_policy); 3517 err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv6_policy);
3521 if (err < 0) 3518 if (err < 0)
3522 return err; 3519 return err;
@@ -3587,9 +3584,6 @@ inet6_rtm_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
3587 u8 ifa_flags; 3584 u8 ifa_flags;
3588 int err; 3585 int err;
3589 3586
3590 if (!capable(CAP_NET_ADMIN))
3591 return -EPERM;
3592
3593 err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv6_policy); 3587 err = nlmsg_parse(nlh, sizeof(*ifm), tb, IFA_MAX, ifa_ipv6_policy);
3594 if (err < 0) 3588 if (err < 0)
3595 return err; 3589 return err;
diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c
index b106f80be0c5..ff76eecfd622 100644
--- a/net/ipv6/addrlabel.c
+++ b/net/ipv6/addrlabel.c
@@ -425,9 +425,6 @@ static int ip6addrlbl_newdel(struct sk_buff *skb, struct nlmsghdr *nlh,
425 u32 label; 425 u32 label;
426 int err = 0; 426 int err = 0;
427 427
428 if (!capable(CAP_NET_ADMIN))
429 return -EPERM;
430
431 err = nlmsg_parse(nlh, sizeof(*ifal), tb, IFAL_MAX, ifal_policy); 428 err = nlmsg_parse(nlh, sizeof(*ifal), tb, IFAL_MAX, ifal_policy);
432 if (err < 0) 429 if (err < 0)
433 return err; 430 return err;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index a86b65599328..8f124f575116 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2446,9 +2446,6 @@ static int inet6_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *a
2446 struct fib6_config cfg; 2446 struct fib6_config cfg;
2447 int err; 2447 int err;
2448 2448
2449 if (!capable(CAP_NET_ADMIN))
2450 return -EPERM;
2451
2452 err = rtm_to_fib6_config(skb, nlh, &cfg); 2449 err = rtm_to_fib6_config(skb, nlh, &cfg);
2453 if (err < 0) 2450 if (err < 0)
2454 return err; 2451 return err;
@@ -2464,9 +2461,6 @@ static int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *a
2464 struct fib6_config cfg; 2461 struct fib6_config cfg;
2465 int err; 2462 int err;
2466 2463
2467 if (!capable(CAP_NET_ADMIN))
2468 return -EPERM;
2469
2470 err = rtm_to_fib6_config(skb, nlh, &cfg); 2464 err = rtm_to_fib6_config(skb, nlh, &cfg);
2471 if (err < 0) 2465 if (err < 0)
2472 return err; 2466 return err;