diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-06-06 19:16:04 +0200 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2008-06-09 11:27:04 -0700 |
| commit | 502f9661c07490f7691962b5956267c0bb01c601 (patch) | |
| tree | 7a813de9a76f10ba9d4b0670b762d1004564a8bf | |
| parent | 84371d53c0aa64f9063fb6a01a17a73c4f243de8 (diff) | |
netfilter: nf_conntrack_expect: fix error path unwind in nf_conntrack_expect_init()
upstream commit: 12293bf91126ad253a25e2840b307fdc7c2754c3
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>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
| -rw-r--r-- | 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 684ec9c1ad38..d15d70f5017f 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; } |