[NETFILTER 1/1]: nf_conntrack_expect: fix error path unwind in nf_conntrack_expect_init()

[Patrick McHardy <kaber@trash.net>]

[-- Attachment #1: Type: text/plain, Size: 120 bytes --]

Attached is a fix from Alexey for incorrect error handling
in nf_conntrack_expect. I'll also queue it up for -stable.



[-- Attachment #2: 01.diff --]
[-- Type: text/x-diff, Size: 852 bytes --]

commit 4a000134ae4d0092de7ef5d8536e3a21d18eb46c
Author: Alexey Dobriyan <adobriyan@parallels.com>
Date:   Tue May 27 06:18:46 2008 +0200

    [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>

diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c
index e31beeb..e8f0dea 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;
 }