From d08860f0569d20a5b759e5747921d29592bb326c Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Thu, 20 Jan 2011 18:55:48 +0100 Subject: 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. --- kernel/include/linux/netfilter/ipset/ip_set_ahash.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel/include/linux/netfilter/ipset/ip_set_ahash.h') 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; -- cgit v1.2.3