lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: ctnetlink: sleepable allocation with spin lock bh

Browse Source 
This patch removes a GFP_KERNEL allocation while holding a spin lock with
bottom halves disabled in ctnetlink_change_helper().

This problem was introduced in 2.6.23 with the netfilter extension
infrastructure.

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>
This commit is contained in:
Pablo Neira Ayuso
2008-08-18 21:31:46 -07:00
committed by David S. Miller
parent cb1cb5c474
commit fab00c5d15
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/netfilter/nf_conntrack_netlink.c
View File

@@ -968,7 +968,7 @@ ctnetlink_change_helper(struct nf_conn *ct, struct nlattr *cda[])
/* need to zero data of old helper */ /* need to zero data of old helper */
memset(&help->help, 0, sizeof(help->help)); memset(&help->help, 0, sizeof(help->help));
} else { } else {
help = nf_ct_helper_ext_add(ct, GFP_KERNEL); help = nf_ct_helper_ext_add(ct, GFP_ATOMIC);
if (help == NULL) if (help == NULL)
return -ENOMEM; return -ENOMEM;
} }