netfilter: ctnetlink: sleepable allocation with spin lock bh
authorPablo Neira Ayuso <pablo@netfilter.org>
Tue, 19 Aug 2008 04:31:46 +0000 (21:31 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 19 Aug 2008 04:31:46 +0000 (21:31 -0700)
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>
net/netfilter/nf_conntrack_netlink.c

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