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/ipv4/fib_frontend.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/ipv4/fib_frontend.c')
-rw-r--r-- | net/ipv4/fib_frontend.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 825c608826de..bce4541c6784 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c | |||
@@ -613,6 +613,9 @@ static int inet_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *ar | |||
613 | struct fib_table *tb; | 613 | struct fib_table *tb; |
614 | int err; | 614 | int err; |
615 | 615 | ||
616 | if (!capable(CAP_NET_ADMIN)) | ||
617 | return -EPERM; | ||
618 | |||
616 | err = rtm_to_fib_config(net, skb, nlh, &cfg); | 619 | err = rtm_to_fib_config(net, skb, nlh, &cfg); |
617 | if (err < 0) | 620 | if (err < 0) |
618 | goto errout; | 621 | goto errout; |
@@ -635,6 +638,9 @@ static int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, void *ar | |||
635 | struct fib_table *tb; | 638 | struct fib_table *tb; |
636 | int err; | 639 | int err; |
637 | 640 | ||
641 | if (!capable(CAP_NET_ADMIN)) | ||
642 | return -EPERM; | ||
643 | |||
638 | err = rtm_to_fib_config(net, skb, nlh, &cfg); | 644 | err = rtm_to_fib_config(net, skb, nlh, &cfg); |
639 | if (err < 0) | 645 | if (err < 0) |
640 | goto errout; | 646 | goto errout; |