pkt_sched: namespace aware act_mirred

Eric Dumazet pointed out that act_mirred needs to find the current net_ns,
and struct net pointer is not provided in the call chain.  His original
patch made use of current->nsproxy->net_ns to find the network namespace,
but this fails to work correctly for userspace code that makes use of
netlink sockets in different network namespaces.  Instead, pass the
"struct net *" down along the call chain to where it is needed.

This version removes the ifb changes as Eric has submitted that patch
separately, but is otherwise identical to the previous version.

Signed-off-by: Benjamin LaHaise <bcrl@kvack.org>
Tested-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 8 deletions

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 65d240cbf74b..8579c4bb20c9 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -485,8 +485,9 @@ errout:
         return err;
 }
 
-struct tc_action *tcf_action_init_1(struct nlattr *nla, struct nlattr *est,
-                                    char *name, int ovr, int bind)
+struct tc_action *tcf_action_init_1(struct net *net, struct nlattr *nla,
+                                    struct nlattr *est, char *name, int ovr,
+                                    int bind)
 {
         struct tc_action *a;
         struct tc_action_ops *a_o;
@@ -542,9 +543,9 @@ struct tc_action *tcf_action_init_1(struct nlattr *nla, struct nlattr *est,
 
         /* backward compatibility for policer */
         if (name == NULL)
-                err = a_o->init(tb[TCA_ACT_OPTIONS], est, a, ovr, bind);
+                err = a_o->init(net, tb[TCA_ACT_OPTIONS], est, a, ovr, bind);
         else
-                err = a_o->init(nla, est, a, ovr, bind);
+                err = a_o->init(net, nla, est, a, ovr, bind);
         if (err < 0)
                 goto err_free;
 
@@ -566,8 +567,9 @@ err_out:
         return ERR_PTR(err);
 }
 
-struct tc_action *tcf_action_init(struct nlattr *nla, struct nlattr *est,
-                                  char *name, int ovr, int bind)
+struct tc_action *tcf_action_init(struct net *net, struct nlattr *nla,
+                                  struct nlattr *est, char *name, int ovr,
+                                  int bind)
 {
         struct nlattr *tb[TCA_ACT_MAX_PRIO + 1];
         struct tc_action *head = NULL, *act, *act_prev = NULL;
@@ -579,7 +581,7 @@ struct tc_action *tcf_action_init(struct nlattr *nla, struct nlattr *est,
                 return ERR_PTR(err);
 
         for (i = 1; i <= TCA_ACT_MAX_PRIO && tb[i]; i++) {
-                act = tcf_action_init_1(tb[i], est, name, ovr, bind);
+                act = tcf_action_init_1(net, tb[i], est, name, ovr, bind);
                 if (IS_ERR(act))
                         goto err;
                 act->order = i;
@@ -960,7 +962,7 @@ tcf_action_add(struct net *net, struct nlattr *nla, struct nlmsghdr *n,
         struct tc_action *a;
         u32 seq = n->nlmsg_seq;
 
-        act = tcf_action_init(nla, NULL, NULL, ovr, 0);
+        act = tcf_action_init(net, nla, NULL, NULL, ovr, 0);
         if (act == NULL)
                 goto done;
         if (IS_ERR(act)) {