summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2008-08-18 21:31:24 -0700
committerDavid S. Miller <davem@davemloft.net>2008-08-18 21:31:24 -0700
commitcb1cb5c47457ff2b604dac2da44cab4d39d11459 (patch)
tree3bd23533d093a73d69c748c97486b292786fbc57 /net
parent1575e7ea018fec992b94a12a1a491ce693ae9eac (diff)
downloadlinux-cb1cb5c47457ff2b604dac2da44cab4d39d11459.tar.gz
linux-cb1cb5c47457ff2b604dac2da44cab4d39d11459.tar.bz2
linux-cb1cb5c47457ff2b604dac2da44cab4d39d11459.zip
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_netlink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index d1fb2f8555e8..a5b95ccb3ce7 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;