Commit 6ba90067 authored Apr 07, 2012 by Gao feng Committed by Pablo Neira Ayuso Apr 10, 2012

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>

parent 07153c6e

net/netfilter/nf_conntrack_core.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1592,7 +1592,7 @@ static int nf_conntrack_init_net(struct net *net)
	return 0;		return 0;

	err_timeout:		err_timeout:
	nf_conntrack_timeout_fini(net);		nf_conntrack_ecache_fini(net);
	err_ecache:		err_ecache:
	nf_conntrack_tstamp_fini(net);		nf_conntrack_tstamp_fini(net);
	err_tstamp:		err_tstamp: