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/sched/cls_api.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/sched/cls_api.c')
-rw-r--r-- | net/sched/cls_api.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 7ae02892437c..ff55ed6c49b2 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c | |||
@@ -139,6 +139,8 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg) | |||
139 | int err; | 139 | int err; |
140 | int tp_created = 0; | 140 | int tp_created = 0; |
141 | 141 | ||
142 | if ((n->nlmsg_type != RTM_GETTFILTER) && !capable(CAP_NET_ADMIN)) | ||
143 | return -EPERM; | ||
142 | replay: | 144 | replay: |
143 | t = nlmsg_data(n); | 145 | t = nlmsg_data(n); |
144 | protocol = TC_H_MIN(t->tcm_info); | 146 | protocol = TC_H_MIN(t->tcm_info); |