summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2016-03-29 11:05:16 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2016-04-07 11:58:49 +0200
commitff76def3bd7e816fe0ca7f0840065c566a42ba2f (patch)
tree5c22c4821fcce9ebb7733c4c6494a2495e94530c /net
parent0a1a37b6d62e6864a77a82e925217c720f91f963 (diff)
downloadlinux-stable-ff76def3bd7e816fe0ca7f0840065c566a42ba2f.tar.gz
linux-stable-ff76def3bd7e816fe0ca7f0840065c566a42ba2f.tar.bz2
linux-stable-ff76def3bd7e816fe0ca7f0840065c566a42ba2f.zip
netfilter: arp_tables: register table in initns
arptables is broken since we didn't register the table anymore -- even 'arptables -L' fails. Fixes: b9e69e127397187b ("netfilter: xtables: don't hook tables by default") Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/netfilter/arptable_filter.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/net/ipv4/netfilter/arptable_filter.c b/net/ipv4/netfilter/arptable_filter.c
index dd8c80dc32a2..8f8713b4388f 100644
--- a/net/ipv4/netfilter/arptable_filter.c
+++ b/net/ipv4/netfilter/arptable_filter.c
@@ -81,6 +81,12 @@ static int __init arptable_filter_init(void)
return ret;
}
+ ret = arptable_filter_table_init(&init_net);
+ if (ret) {
+ unregister_pernet_subsys(&arptable_filter_net_ops);
+ kfree(arpfilter_ops);
+ }
+
return ret;
}