1 files changed, 3 insertions, 4 deletions

diff --git a/mm/slab.h b/mm/slab.h
index 4190c24ef0e9..384105318779 100644
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -437,11 +437,10 @@ static inline void slab_post_alloc_hook(struct kmem_cache *s, gfp_t flags,
 
         flags &= gfp_allowed_mask;
         for (i = 0; i < size; i++) {
-                void *object = p[i];
-
-                kmemleak_alloc_recursive(object, s->object_size, 1,
+                p[i] = kasan_slab_alloc(s, p[i], flags);
+                /* As p[i] might get tagged, call kmemleak hook after KASAN. */
+                kmemleak_alloc_recursive(p[i], s->object_size, 1,
                                          s->flags, flags);
-                p[i] = kasan_slab_alloc(s, object, flags);
         }
 
         if (memcg_kmem_enabled())