netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net
authorGao feng <gaofeng@cn.fujitsu.com>
Sat, 7 Apr 2012 16:08:28 +0000 (16:08 +0000)
committerPablo Neira Ayuso <pablo@netfilter.org>
Tue, 10 Apr 2012 11:00:38 +0000 (13:00 +0200)
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>
net/netfilter/nf_conntrack_core.c

index 3cc4487ac349997850940c6cbd274c196863f6aa..729f157a0efa690cf877dbd9dbb94dd1b09f1be6 100644 (file)
@@ -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: