From: Patrick McHardy <kaber@trash.net>
To: stable@kernel.org
Cc: Patrick McHardy <kaber@trash.net>,
netfilter-devel@vger.kernel.org, davem@davemloft.net
Subject: netfilter 01/03: nf_conntrack_expect: fix error path unwind in nf_conntrack_expect_init()
Date: Fri, 6 Jun 2008 19:18:42 +0200 (MEST) [thread overview]
Message-ID: <20080606171840.28097.34095.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20080606171839.28097.47793.sendpatchset@localhost.localdomain>
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>
---
commit d025d91021895314ce10cc0ab8e0f627dc1a12fa
tree 585226823a29b62d80781ba2bc605bc7178aa5d3
parent a82a9bfebc74862798a3f6949fe6f6a959c1fd4e
author Alexey Dobriyan <adobriyan@parallels.com> Fri, 06 Jun 2008 19:06:15 +0200
committer Patrick McHardy <kaber@trash.net> Fri, 06 Jun 2008 19:06:15 +0200
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 684ec9c..d15d70f 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;
}
next prev parent reply other threads:[~2008-06-06 17:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-06 17:18 netfilter 00/03: netfilter -stable update Patrick McHardy
2008-06-06 17:18 ` Patrick McHardy [this message]
2008-06-06 17:18 ` netfilter 02/03: xt_connlimit: fix accouning when receive RST packet in ESTABLISHED state Patrick McHardy
2008-06-06 17:18 ` netfilter 03/03: nf_conntrack_ipv6: fix inconsistent lock state in nf_ct_frag6_gather() Patrick McHardy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080606171840.28097.34095.sendpatchset@localhost.localdomain \
--to=kaber@trash.net \
--cc=davem@davemloft.net \
--cc=netfilter-devel@vger.kernel.org \
--cc=stable@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.