Commit 9dbeea7f authored Aug 26, 2016 by Eric Dumazet Committed by David S. Miller Aug 26, 2016

rhashtable: fix a memory leak in alloc_bucket_locks()



If vmalloc() was successful, do not attempt a kmalloc_array()

Fixes: 4cf0b354 ("rhashtable: avoid large lock-array allocations")
Reported-by: CAI Qian <caiqian@redhat.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Florian Westphal <fw@strlen.de>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Tested-by: CAI Qian <caiqian@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e70c70c3

lib/rhashtable.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -77,15 +77,16 @@ static int alloc_bucket_locks(struct rhashtable ht, struct bucket_table tbl,
		size = min_t(unsigned int, size, tbl->size >> 1);

		if (sizeof(spinlock_t) != 0) {
		tbl->locks = NULL;
		#ifdef CONFIG_NUMA
		if (size * sizeof(spinlock_t) > PAGE_SIZE &&
		gfp == GFP_KERNEL)
		tbl->locks = vmalloc(size * sizeof(spinlock_t));
		else
		#endif
		if (gfp != GFP_KERNEL)
		gfp \|= __GFP_NOWARN \| __GFP_NORETRY;

		if (!tbl->locks)
		tbl->locks = kmalloc_array(size, sizeof(spinlock_t),
		gfp);
		if (!tbl->locks)