X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=mm%2Fkmemleak.c;h=fe6e3ae8e8c6719f7ae6bead5954e2f43109a523;hb=c9170f132178cdafefcff7d16434ff3c1b13a988;hp=c0014d3b91c10f2689f99d83c9ba2bd04cbbfea7;hpb=415e915fdfc775ad0c6675fde1008f6f43dd6251;p=linux-2.6-microblaze.git

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index c0014d3b91c1..fe6e3ae8e8c6 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -97,6 +97,7 @@
 #include <linux/atomic.h>
 
 #include <linux/kasan.h>
+#include <linux/kfence.h>
 #include <linux/kmemleak.h>
 #include <linux/memory_hotplug.h>
 
@@ -589,7 +590,7 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size,
 	atomic_set(&object->use_count, 1);
 	object->flags = OBJECT_ALLOCATED;
 	object->pointer = ptr;
-	object->size = size;
+	object->size = kfence_ksize((void *)ptr) ?: size;
 	object->excess_ref = 0;
 	object->min_count = min_count;
 	object->count = 0;			/* white color initially */