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/phonet | |
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/phonet')
-rw-r--r-- | net/phonet/pn_netlink.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/phonet/pn_netlink.c b/net/phonet/pn_netlink.c index 83a8389619aa..0193630d3061 100644 --- a/net/phonet/pn_netlink.c +++ b/net/phonet/pn_netlink.c | |||
@@ -70,6 +70,9 @@ static int addr_doit(struct sk_buff *skb, struct nlmsghdr *nlh, void *attr) | |||
70 | int err; | 70 | int err; |
71 | u8 pnaddr; | 71 | u8 pnaddr; |
72 | 72 | ||
73 | if (!capable(CAP_NET_ADMIN)) | ||
74 | return -EPERM; | ||
75 | |||
73 | if (!capable(CAP_SYS_ADMIN)) | 76 | if (!capable(CAP_SYS_ADMIN)) |
74 | return -EPERM; | 77 | return -EPERM; |
75 | 78 | ||
@@ -230,6 +233,9 @@ static int route_doit(struct sk_buff *skb, struct nlmsghdr *nlh, void *attr) | |||
230 | int err; | 233 | int err; |
231 | u8 dst; | 234 | u8 dst; |
232 | 235 | ||
236 | if (!capable(CAP_NET_ADMIN)) | ||
237 | return -EPERM; | ||
238 | |||
233 | if (!capable(CAP_SYS_ADMIN)) | 239 | if (!capable(CAP_SYS_ADMIN)) |
234 | return -EPERM; | 240 | return -EPERM; |
235 | 241 | ||