From: Gao feng <gaofeng@cn.fujitsu.com>
Date: Sat, 7 Apr 2012 16:08:28 +0000 (+0000)
Subject: netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net
X-Git-Tag: v3.4-rc3~32^2~7^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6ba900676bec8baaf61aa2f85b7345c0e65774d9;p=~emulex%2Finfiniband.git

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>
---

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 3cc4487ac34..729f157a0ef 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: