* [NETFILTER 1/1]: nf_conntrack_expect: fix error path unwind in nf_conntrack_expect_init()
@ 2008-05-27 5:00 Patrick McHardy
2008-05-29 10:21 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Patrick McHardy @ 2008-05-27 5:00 UTC (permalink / raw)
To: David S. Miller; +Cc: Netfilter Development Mailinglist
[-- 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;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-05-29 10:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-27 5:00 [NETFILTER 1/1]: nf_conntrack_expect: fix error path unwind in nf_conntrack_expect_init() Patrick McHardy
2008-05-29 10:21 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.