diff options
| author |   Pablo Neira Ayuso <pablo@netfilter.org> | 2012-04-03 12:32:15 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-04-03 19:16:39 -0400 |
| commit | ca53e4405347a1e19eaf59c757ceaaaa1a784758 (patch) | |
| tree | 2be033f9ae8057c50ff2ac9e07aba919d692cb82 /net/netfilter | |
| parent | Merge branch 'master' of git://1984.lsi.us.es/net (diff) | |
| download | linux-dev-ca53e4405347a1e19eaf59c757ceaaaa1a784758.tar.xz linux-dev-ca53e4405347a1e19eaf59c757ceaaaa1a784758.zip | |
netfilter: xt_CT: allocation has to be GFP_ATOMIC under rcu_read_lock section
Reported-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/xt_CT.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/xt_CT.c b/net/netfilter/xt_CT.c index 138b75e41fdd..4babb278e41e 100644 --- a/net/netfilter/xt_CT.c +++ b/net/netfilter/xt_CT.c @@ -261,7 +261,7 @@ static int xt_ct_tg_check_v1(const struct xt_tgchk_param *par) goto err4; } timeout_ext = nf_ct_timeout_ext_add(ct, timeout, - GFP_KERNEL); + GFP_ATOMIC); if (timeout_ext == NULL) { ret = -ENOMEM; goto err4; |