summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorGao feng <gaofeng@cn.fujitsu.com>2012-04-07 16:08:28 +0000
committerPablo Neira Ayuso <pablo@netfilter.org>2012-04-10 13:00:38 +0200
commit6ba900676bec8baaf61aa2f85b7345c0e65774d9 (patch)
tree7074065c1308041ec4d4a99f51dda2290aed9bca /net
parent07153c6ec074257ade76a461429b567cff2b3a1e (diff)
downloadop-kernel-dev-6ba900676bec8baaf61aa2f85b7345c0e65774d9.zip
op-kernel-dev-6ba900676bec8baaf61aa2f85b7345c0e65774d9.tar.gz
netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net
in function nf_conntrack_init_net,when nf_conntrack_timeout_init falied, we should call nf_conntrack_ecache_fini to do rollback. but the current code calls nf_conntrack_timeout_fini. Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 3cc4487..729f157 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -1592,7 +1592,7 @@ static int nf_conntrack_init_net(struct net *net)
return 0;
err_timeout:
- nf_conntrack_timeout_fini(net);
+ nf_conntrack_ecache_fini(net);
err_ecache:
nf_conntrack_tstamp_fini(net);
err_tstamp:
OpenPOWER on IntegriCloud