net/core/neighbour: tell kmemleak about hash tables (85704cb8) · Commits · 戴 / test

net/core/neighbour.c

+9 −4

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@
	#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt		#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

	#include <linux/slab.h>		#include <linux/slab.h>
			#include <linux/kmemleak.h>
	#include <linux/types.h>		#include <linux/types.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/module.h>		#include <linux/module.h>
	@@ -443,12 +444,14 @@ static struct neigh_hash_table *neigh_hash_alloc(unsigned int shift)
	ret = kmalloc(sizeof(*ret), GFP_ATOMIC);		ret = kmalloc(sizeof(*ret), GFP_ATOMIC);
	if (!ret)		if (!ret)
	return NULL;		return NULL;
	if (size <= PAGE_SIZE)		if (size <= PAGE_SIZE) {
	buckets = kzalloc(size, GFP_ATOMIC);		buckets = kzalloc(size, GFP_ATOMIC);
	else		} else {
	buckets = (struct neighbour __rcu **)		buckets = (struct neighbour __rcu **)
	__get_free_pages(GFP_ATOMIC \| __GFP_ZERO,		__get_free_pages(GFP_ATOMIC \| __GFP_ZERO,
	get_order(size));		get_order(size));
			kmemleak_alloc(buckets, size, 0, GFP_ATOMIC);
			}
	if (!buckets) {		if (!buckets) {
	kfree(ret);		kfree(ret);
	return NULL;		return NULL;
	@@ -468,10 +471,12 @@ static void neigh_hash_free_rcu(struct rcu_head *head)
	size_t size = (1 << nht->hash_shift) * sizeof(struct neighbour *);		size_t size = (1 << nht->hash_shift) * sizeof(struct neighbour *);
	struct neighbour __rcu **buckets = nht->hash_buckets;		struct neighbour __rcu **buckets = nht->hash_buckets;

	if (size <= PAGE_SIZE)		if (size <= PAGE_SIZE) {
	kfree(buckets);		kfree(buckets);
	else		} else {
			kmemleak_free(buckets);
	free_pages((unsigned long)buckets, get_order(size));		free_pages((unsigned long)buckets, get_order(size));
			}
	kfree(nht);		kfree(nht);
	}		}

Admin message