diff options
| author | Alexey Dobriyan <adobriyan@parallels.com> | 2008-05-29 12:19:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-29 12:19:37 +0200 |
| commit | 12293bf91126ad253a25e2840b307fdc7c2754c3 (patch) | |
| tree | f936e8c39267398e77bc7ab71b63098ebd878e7c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville... (diff) | |
| download | linux-12293bf91126ad253a25e2840b307fdc7c2754c3.tar.xz linux-12293bf91126ad253a25e2840b307fdc7c2754c3.zip | |
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>
| -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 e31beeb33b2b..e8f0dead267f 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; } |