diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-11-15 22:03:00 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-11-18 20:32:44 -0500 |
commit | dfc47ef8639facd77210e74be831943c2fdd9c74 (patch) | |
tree | 5c7e9f93a999bf1d38b216af346ce2159e5f18ec /net/decnet/dn_fib.c | |
parent | 464dc801c76aa0db88e16e8f5f47c6879858b9b2 (diff) |
net: Push capable(CAP_NET_ADMIN) into the rtnl methods
- In rtnetlink_rcv_msg convert the capable(CAP_NET_ADMIN) check
to ns_capable(net->user-ns, CAP_NET_ADMIN). Allowing unprivileged
users to make netlink calls to modify their local network
namespace.
- In the rtnetlink doit methods add capable(CAP_NET_ADMIN) so
that calls that are not safe for unprivileged users are still
protected.
Later patches will remove the extra capable calls from methods
that are safe for unprivilged users.
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet/dn_fib.c')
-rw-r--r-- | net/decnet/dn_fib.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c index 102d6106a942..e36614eccc04 100644 --- a/net/decnet/dn_fib.c +++ b/net/decnet/dn_fib.c | |||
@@ -520,6 +520,9 @@ static int dn_fib_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, void * | |||
520 | struct rtattr **rta = arg; | 520 | struct rtattr **rta = arg; |
521 | struct rtmsg *r = NLMSG_DATA(nlh); | 521 | struct rtmsg *r = NLMSG_DATA(nlh); |
522 | 522 | ||
523 | if (!capable(CAP_NET_ADMIN)) | ||
524 | return -EPERM; | ||
525 | |||
523 | if (!net_eq(net, &init_net)) | 526 | if (!net_eq(net, &init_net)) |
524 | return -EINVAL; | 527 | return -EINVAL; |
525 | 528 | ||
@@ -540,6 +543,9 @@ static int dn_fib_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, void * | |||
540 | struct rtattr **rta = arg; | 543 | struct rtattr **rta = arg; |
541 | struct rtmsg *r = NLMSG_DATA(nlh); | 544 | struct rtmsg *r = NLMSG_DATA(nlh); |
542 | 545 | ||
546 | if (!capable(CAP_NET_ADMIN)) | ||
547 | return -EPERM; | ||
548 | |||
543 | if (!net_eq(net, &init_net)) | 549 | if (!net_eq(net, &init_net)) |
544 | return -EINVAL; | 550 | return -EINVAL; |
545 | 551 | ||