| Message ID | 1398871543-8435-1-git-send-email-stgraber@ubuntu.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, 2014-04-30 at 11:25 -0400, 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@ubuntu.com> > Acked-by: Serge 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> > > --- > net/sched/cls_api.c | 3 ++- > net/sched/sch_api.c | 8 +++++--- > 2 files changed, 7 insertions(+), 4 deletions(-) Acked-by: Eric Dumazet <edumazet@google.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Stéphane Graber <stgraber@ubuntu.com> Date: Wed, 30 Apr 2014 11:25:43 -0400 > 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@ubuntu.com> > Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com> Applied to net-next, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 8e118af..4c35f4a 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -138,7 +138,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 cd81505..fc90bde 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -1079,7 +1079,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); @@ -1146,7 +1147,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: @@ -1486,7 +1487,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);