summaryrefslogtreecommitdiffstats
path: root/kernel/net
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2016-10-11 22:19:51 +0200
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2016-10-11 22:19:51 +0200
commitc71fc214fe8e134d6e8ffeed4043bcb4320e48d4 (patch)
treeea5febf175811f7af57fbc5bf40474d7d2d5540e /kernel/net
parentf0c110ecc4b8b04e1bbf6766284d3bf52cd73a30 (diff)
netfilter: x_tables: Pass struct net in xt_action_param
As xt_action_param lives on the stack this does not bloat any persistent data structures. This is a first step in making netfilter code that needs to know which network namespace it is executing in simpler. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'kernel/net')
-rw-r--r--kernel/net/sched/em_ipset.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/net/sched/em_ipset.c b/kernel/net/sched/em_ipset.c
index 87b8419..a4ab08d 100644
--- a/kernel/net/sched/em_ipset.c
+++ b/kernel/net/sched/em_ipset.c
@@ -119,6 +119,9 @@ static int em_ipset_match(struct sk_buff *skb, struct tcf_ematch *em,
indev = dev_get_by_index_rcu(dev_net(dev), skb->skb_iif);
#endif
+#ifdef HAVE_NET_IN_XT_ACTION_PARAM
+ acpar.net = em->net;
+#endif
acpar.in = indev ? indev : dev;
acpar.out = dev;