summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorKonstantin Khlebnikov <khlebnikov@yandex-team.ru>2019-01-14 13:38:43 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-12-05 15:37:55 +0100
commit951c390b1edccf886a91dd019e569a4b9b5fdec0 (patch)
tree6549396d75607adf8b4d37f686943fd11d275501 /net/core
parent5ab9b2bc8a7617c8a5d7f34505c3f8485d580607 (diff)
downloadlinux-stable-951c390b1edccf886a91dd019e569a4b9b5fdec0.tar.gz
linux-stable-951c390b1edccf886a91dd019e569a4b9b5fdec0.tar.bz2
linux-stable-951c390b1edccf886a91dd019e569a4b9b5fdec0.zip
net/core/neighbour: fix kmemleak minimal reference count for hash tables
[ Upstream commit 01b833ab44c9e484060aad72267fc7e71beb559b ] This should be 1 for normal allocations, 0 disables leak reporting. Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru> Reported-by: Cong Wang <xiyou.wangcong@gmail.com> Fixes: 85704cb8dcfd ("net/core/neighbour: tell kmemleak about hash tables") Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/neighbour.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 9a28a21a51f0..2664ad58e5c0 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -368,7 +368,7 @@ static struct neigh_hash_table *neigh_hash_alloc(unsigned int shift)
buckets = (struct neighbour __rcu **)
__get_free_pages(GFP_ATOMIC | __GFP_ZERO,
get_order(size));
- kmemleak_alloc(buckets, size, 0, GFP_ATOMIC);
+ kmemleak_alloc(buckets, size, 1, GFP_ATOMIC);
}
if (!buckets) {
kfree(ret);