Skip to content

Commit

Permalink
netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_net
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Gao feng authored and Pablo Neira Ayuso committed Apr 10, 2012
1 parent 07153c6 commit 6ba9006
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/netfilter/nf_conntrack_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 6ba9006

Please sign in to comment.