net: Allow tc changes in user namespaces

[Tim Gardner]

On 05/08/2014 06:19 PM, Stéphane Graber wrote:
> 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: Stéphane Graber <stgraber at ubuntu.com>
> Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
> Cc: "Eric W. Biederman" <ebiederm at xmission.com>
> Cc: Jamal Hadi Salim <jhs at mojatatu.com>
> Cc: "David S. Miller" <davem at davemloft.net>
> Acked-by: Eric Dumazet <edumazet at google.com>
> Signed-off-by: David S. Miller <davem at davemloft.net>
>
> diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
> index a481bbe..1a4a202 100644
> --- a/net/sched/cls_api.c
> +++ b/net/sched/cls_api.c
> @@ -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:
> diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
> index a0b84e0..86f8edf 100644
> --- a/net/sched/sch_api.c
> +++ b/net/sched/sch_api.c
> @@ -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);
>

This looks like it should get merged next week. We'll until until then 
'cause it won't make this SRU cycle anyway.

rtg
-- 
Tim Gardner tim.gardner at canonical.com