From: Patrick McHardy <kaber@trash.net>
To: davem@davemloft.net
Cc: Patrick McHardy <kaber@trash.net>, netfilter-devel@vger.kernel.org
Subject: netfilter 04/06: ctnetlink: fix sleep in read-side lock section
Date: Mon, 18 Aug 2008 18:51:54 +0200 (MEST) [thread overview]
Message-ID: <20080818165153.18978.28019.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20080818165147.18978.92208.sendpatchset@localhost.localdomain>
netfilter: ctnetlink: fix sleep in read-side lock section
Fix allocation with GFP_KERNEL in ctnetlink_create_conntrack() under
read-side lock sections.
This problem was introduced in 2.6.25.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
commit 3b198ff714ffc62115554f821e80f22d817b2b17
tree 48aa718f0375e5a110357682f789800c85516969
parent 4a58ff2a369c6020ece596812f819641f9d19820
author Pablo Neira Ayuso <pablo@netfilter.org> Mon, 18 Aug 2008 13:17:04 +0200
committer Patrick McHardy <kaber@trash.net> Mon, 18 Aug 2008 13:17:04 +0200
net/netfilter/nf_conntrack_netlink.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index d1fb2f8..a5b95cc 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1139,7 +1139,7 @@ ctnetlink_create_conntrack(struct nlattr *cda[],
rcu_read_lock();
helper = __nf_ct_helper_find(rtuple);
if (helper) {
- help = nf_ct_helper_ext_add(ct, GFP_KERNEL);
+ help = nf_ct_helper_ext_add(ct, GFP_ATOMIC);
if (help == NULL) {
rcu_read_unlock();
err = -ENOMEM;
next prev parent reply other threads:[~2008-08-18 16:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-18 16:51 netfilter 00/06: netfilter fixes Patrick McHardy
2008-08-18 16:51 ` netfilter 01/06: Move linux/in.h and linux/in6.h inclusions outside of Patrick McHardy
2008-08-18 16:57 ` Jan Engelhardt
2008-08-18 17:01 ` Patrick McHardy
2008-08-19 4:21 ` David Miller
2008-08-18 16:51 ` netfilter 02/06: ipt_addrtype: fix matching of inverted destination address type Patrick McHardy
2008-08-19 4:30 ` David Miller
2008-08-18 16:51 ` netfilter 03/06: ctnetlink: fix double helper assignation for NAT'ed conntracks Patrick McHardy
2008-08-19 4:31 ` David Miller
2008-08-18 16:51 ` Patrick McHardy [this message]
2008-08-19 4:31 ` netfilter 04/06: ctnetlink: fix sleep in read-side lock section David Miller
2008-08-18 16:51 ` netfilter 05/06: ctnetlink: sleepable allocation with spin lock bh Patrick McHardy
2008-08-19 4:31 ` David Miller
2008-08-18 16:51 ` nf_nat 06/06: use secure_ipv4_port_ephemeral() for NAT port randomization Patrick McHardy
2008-08-19 4:32 ` David Miller
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=20080818165153.18978.28019.sendpatchset@localhost.localdomain \
--to=kaber@trash.net \
--cc=davem@davemloft.net \
--cc=netfilter-devel@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox