From: Alexey Dobriyan <adobriyan@parallels.com>
Date: Thu, 29 May 2008 10:19:37 +0000 (-0700)
Subject: netfilter: nf_conntrack_expect: fix error path unwind in nf_conntrack_expect_init()
X-Git-Tag: v2.6.26-rc5~34^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=12293bf91126ad253a25e2840b307fdc7c2754c3;p=linux-2.6-omap-h63xx.git

netfilter: nf_conntrack_expect: fix error path unwind in nf_conntrack_expect_init()

Signed-off-by: Alexey Dobriyan <adobriyan@parallels.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c
index e31beeb33b2..e8f0dead267 100644
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@ -587,10 +587,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;
 }