1 files changed, 10 insertions, 5 deletions

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 763a7b08df67..4230400b9a30 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -18,6 +18,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/slab.h>
+#include <linux/kmemleak.h>
 #include <linux/types.h>
 #include <linux/kernel.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);
         if (!ret)
                 return NULL;
-        if (size <= PAGE_SIZE)
+        if (size <= PAGE_SIZE) {
                 buckets = kzalloc(size, GFP_ATOMIC);
-        else
+        } else {
                 buckets = (struct neighbour __rcu **)
                           __get_free_pages(GFP_ATOMIC | __GFP_ZERO,
                                            get_order(size));
+                kmemleak_alloc(buckets, size, 1, GFP_ATOMIC);
+        }
         if (!buckets) {
                 kfree(ret);
                 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 *);
         struct neighbour __rcu **buckets = nht->hash_buckets;
 
-        if (size <= PAGE_SIZE)
+        if (size <= PAGE_SIZE) {
                 kfree(buckets);
-        else
+        } else {
+                kmemleak_free(buckets);
                 free_pages((unsigned long)buckets, get_order(size));
+        }
         kfree(nht);
 }
 
@@ -1002,7 +1007,7 @@ static void neigh_probe(struct neighbour *neigh)
         if (neigh->ops->solicit)
                 neigh->ops->solicit(neigh, skb);
         atomic_inc(&neigh->probes);
-        kfree_skb(skb);
+        consume_skb(skb);
 }
 
 /* Called when a timer expires for a neighbour entry. */