context_tracking: Rename context symbols to prepare for transition state

[cascardo/linux.git] / include / linux / slab.h

diff --git a/include/linux/slab.h b/include/linux/slab.h
index ed2ffaa..76f1fee 100644 (file)
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -104,6 +104,7 @@
                                (unsigned long)ZERO_SIZE_PTR)
 
 #include <linux/kmemleak.h>
+#include <linux/kasan.h>
 
 struct mem_cgroup;
 /*
@@ -325,7 +326,10 @@ kmem_cache_alloc_node_trace(struct kmem_cache *s,
 static __always_inline void *kmem_cache_alloc_trace(struct kmem_cache *s,
                gfp_t flags, size_t size)
 {
-       return kmem_cache_alloc(s, flags);
+       void *ret = kmem_cache_alloc(s, flags);
+
+       kasan_kmalloc(s, ret, size);
+       return ret;
 }
 
 static __always_inline void *
@@ -333,7 +337,10 @@ kmem_cache_alloc_node_trace(struct kmem_cache *s,
                              gfp_t gfpflags,
                              int node, size_t size)
 {
-       return kmem_cache_alloc_node(s, gfpflags, node);
+       void *ret = kmem_cache_alloc_node(s, gfpflags, node);
+
+       kasan_kmalloc(s, ret, size);
+       return ret;
 }
 #endif /* CONFIG_TRACING */