Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e8bbb81 authored by Stéphane Graber's avatar Stéphane Graber Committed by David S. Miller
Browse files

net: Allow tc changes in user namespaces 



This switches a few remaining capable(CAP_NET_ADMIN) to ns_capable so
that root in a user namespace may set tc rules inside that namespace.

Signed-off-by: default avatarStéphane Graber <stgraber@ubuntu.com>
Acked-by: default avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: "David S. Miller" <davem@davemloft.net>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3c4de5a0

net/sched/cls_api.c

+2 −1
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n) 
	int err;

	int tp_created = 0;



	if ((n->nlmsg_type != RTM_GETTFILTER) && !capable(CAP_NET_ADMIN))

	if ((n->nlmsg_type != RTM_GETTFILTER) &&

	    !ns_capable(net->user_ns, CAP_NET_ADMIN))

		return -EPERM;



replay:

net/sched/sch_api.c

+5 −3
Original line number Diff line number Diff line
@@ -1084,7 +1084,8 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n) 
	struct Qdisc *p = NULL;

	int err;



	if ((n->nlmsg_type != RTM_GETQDISC) && !capable(CAP_NET_ADMIN))

	if ((n->nlmsg_type != RTM_GETQDISC) &&

	    !ns_capable(net->user_ns, CAP_NET_ADMIN))

		return -EPERM;



	err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, NULL);
@@ -1151,7 +1152,7 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n) 
	struct Qdisc *q, *p;

	int err;



	if (!capable(CAP_NET_ADMIN))

	if (!ns_capable(net->user_ns, CAP_NET_ADMIN))

		return -EPERM;



replay:
@@ -1490,7 +1491,8 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n) 
	u32 qid;

	int err;



	if ((n->nlmsg_type != RTM_GETTCLASS) && !capable(CAP_NET_ADMIN))

	if ((n->nlmsg_type != RTM_GETTCLASS) &&

	    !ns_capable(net->user_ns, CAP_NET_ADMIN))

		return -EPERM;



	err = nlmsg_parse(n, sizeof(*tcm), tca, TCA_MAX, NULL);