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, 8 insertions, 7 deletions

diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
index c10d57bf98f2..37da567d833e 100644
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
@@ -335,9 +335,10 @@ static const struct nla_policy route4_policy[TCA_ROUTE4_MAX + 1] = {
         [TCA_ROUTE4_IIF]        = { .type = NLA_U32 },
 };
 
-static int route4_set_parms(struct tcf_proto *tp, unsigned long base,
-        struct route4_filter *f, u32 handle, struct route4_head *head,
-        struct nlattr **tb, struct nlattr *est, int new)
+static int route4_set_parms(struct net *net, struct tcf_proto *tp,
+                            unsigned long base, struct route4_filter *f,
+                            u32 handle, struct route4_head *head,
+                            struct nlattr **tb, struct nlattr *est, int new)
 {
         int err;
         u32 id = 0, to = 0, nhandle = 0x8000;
@@ -346,7 +347,7 @@ static int route4_set_parms(struct tcf_proto *tp, unsigned long base,
         struct route4_bucket *b;
         struct tcf_exts e;
 
-        err = tcf_exts_validate(tp, tb, est, &e, &route_ext_map);
+        err = tcf_exts_validate(net, tp, tb, est, &e, &route_ext_map);
         if (err < 0)
                 return err;
 
@@ -427,7 +428,7 @@ errout:
         return err;
 }
 
-static int route4_change(struct sk_buff *in_skb,
+static int route4_change(struct net *net, struct sk_buff *in_skb,
                        struct tcf_proto *tp, unsigned long base,
                        u32 handle,
                        struct nlattr **tca,
@@ -457,7 +458,7 @@ static int route4_change(struct sk_buff *in_skb,
                 if (f->bkt)
                         old_handle = f->handle;
 
-                err = route4_set_parms(tp, base, f, handle, head, tb,
+                err = route4_set_parms(net, tp, base, f, handle, head, tb,
                         tca[TCA_RATE], 0);
                 if (err < 0)
                         return err;
@@ -480,7 +481,7 @@ static int route4_change(struct sk_buff *in_skb,
         if (f == NULL)
                 goto errout;
 
-        err = route4_set_parms(tp, base, f, handle, head, tb,
+        err = route4_set_parms(net, tp, base, f, handle, head, tb,
                 tca[TCA_RATE], 1);
         if (err < 0)
                 goto errout;