netfilter: nf_conntrack_expect: fix error path unwind in nf_conntrack_expect_init() Upstream commit 12293bf91126ad253a25e2840b307fdc7c2754c3 Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxxxxxx> Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx> --- commit d025d91021895314ce10cc0ab8e0f627dc1a12fa tree 585226823a29b62d80781ba2bc605bc7178aa5d3 parent a82a9bfebc74862798a3f6949fe6f6a959c1fd4e author Alexey Dobriyan <adobriyan@xxxxxxxxxxxxx> Fri, 06 Jun 2008 19:06:15 +0200 committer Patrick McHardy <kaber@xxxxxxxxx> Fri, 06 Jun 2008 19:06:15 +0200 net/netfilter/nf_conntrack_expect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c index 684ec9c..d15d70f 100644 --- a/net/netfilter/nf_conntrack_expect.c +++ b/net/netfilter/nf_conntrack_expect.c @@ -550,10 +550,10 @@ int __init nf_conntrack_expect_init(void) return 0; err3: + kmem_cache_destroy(nf_ct_expect_cachep); +err2: nf_ct_free_hashtable(nf_ct_expect_hash, nf_ct_expect_vmalloc, nf_ct_expect_hsize); -err2: - kmem_cache_destroy(nf_ct_expect_cachep); err1: return err; } -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
