Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b1686a7 authored by Eric Dumazet's avatar Eric Dumazet Committed by Patrick McHardy
Browse files

netfilter: nf_conntrack: allow nf_ct_alloc_hashtable() to get highmem pages 



commit ea781f19 (use SLAB_DESTROY_BY_RCU and get rid of call_rcu())
did a mistake in __vmalloc() call in nf_ct_alloc_hashtable().

I forgot to add __GFP_HIGHMEM, so pages were taken from LOWMEM only.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Cc: stable@kernel.org
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent c1758012

net/netfilter/nf_conntrack_core.c

+2 −1
Original line number Diff line number Diff line
@@ -1312,7 +1312,8 @@ void *nf_ct_alloc_hashtable(unsigned int *sizep, int *vmalloced, int nulls) 
	if (!hash) {

		*vmalloced = 1;

		printk(KERN_WARNING "nf_conntrack: falling back to vmalloc.\n");

		hash = __vmalloc(sz, GFP_KERNEL | __GFP_ZERO, PAGE_KERNEL);

		hash = __vmalloc(sz, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,

				 PAGE_KERNEL);

	}



	if (hash && nulls)