diff options
author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-01-20 18:55:48 +0100 |
---|---|---|
committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-01-20 18:55:48 +0100 |
commit | d08860f0569d20a5b759e5747921d29592bb326c (patch) | |
tree | ace3e9849d0db4958f52ebb4dd9411941efc937f /kernel/include | |
parent | 07d2ca530d353bc8a2b401674732ec3ba3d11977 (diff) |
Fix wrong kzalloc flag in type_pf_expire
The expire functions of the hash types are called while locked, so
kzalloc must be called with GFP_ATOMIC.
Diffstat (limited to 'kernel/include')
-rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set_ahash.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_ahash.h b/kernel/include/linux/netfilter/ipset/ip_set_ahash.h index 621e119..05855a7 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_ahash.h +++ b/kernel/include/linux/netfilter/ipset/ip_set_ahash.h @@ -701,7 +701,7 @@ type_pf_expire(struct ip_set_hash *h) if (n->pos + AHASH_INIT_SIZE < n->size) { void *tmp = kzalloc((n->size - AHASH_INIT_SIZE) * sizeof(struct type_pf_telem), - GFP_KERNEL); + GFP_ATOMIC); if (!tmp) /* Still try to delete expired elements */ continue; |