summaryrefslogtreecommitdiffstats
path: root/net/netfilter
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2014-01-09 20:32:19 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2014-01-09 23:25:48 +0100
commitcf4dfa85395ebe2769267a072b39e48301669842 (patch)
tree92978b3f3a0088763a7a683166c1b25c8883cea2 /net/netfilter
parent3876d22dba62ebf6582f33e1ef2160eeb95e1129 (diff)
downloadlinux-stable-cf4dfa85395ebe2769267a072b39e48301669842.tar.gz
linux-stable-cf4dfa85395ebe2769267a072b39e48301669842.tar.bz2
linux-stable-cf4dfa85395ebe2769267a072b39e48301669842.zip
netfilter: nf_tables: fix error path in the init functions
We have to unregister chain type if this fails to register netns. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
-rw-r--r--net/netfilter/nf_tables_inet.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/net/netfilter/nf_tables_inet.c b/net/netfilter/nf_tables_inet.c
index 84478de179ea..9dd2d216cfc1 100644
--- a/net/netfilter/nf_tables_inet.c
+++ b/net/netfilter/nf_tables_inet.c
@@ -80,8 +80,14 @@ static const struct nf_chain_type filter_inet = {
static int __init nf_tables_inet_init(void)
{
+ int ret;
+
nft_register_chain_type(&filter_inet);
- return register_pernet_subsys(&nf_tables_inet_net_ops);
+ ret = register_pernet_subsys(&nf_tables_inet_net_ops);
+ if (ret < 0)
+ nft_unregister_chain_type(&filter_inet);
+
+ return ret;
}
static void __exit nf_tables_inet_exit(void)