diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-11-16 03:03:00 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-18 20:32:44 -0500 |
| commit | dfc47ef8639facd77210e74be831943c2fdd9c74 (patch) | |
| tree | 5c7e9f93a999bf1d38b216af346ce2159e5f18ec /net/bridge | |
| 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/bridge')
| -rw-r--r-- | net/bridge/br_netlink.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 65429b99a2a3..49e14937019d 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -240,6 +240,9 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh) struct nlattr *tb[IFLA_BRPORT_MAX]; int err; + if (!capable(CAP_NET_ADMIN)) + return -EPERM; + ifm = nlmsg_data(nlh); protinfo = nlmsg_find_attr(nlh, sizeof(*ifm), IFLA_PROTINFO); |