Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[deliverable/linux.git] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index 28864c0224300562b4dc8cf4098b6e87eb5b51cf..cc8bbc1e6bc9b6fe5d980ffe3837d7b4c8843d84 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -4501,7 +4501,7 @@ size_t ksize(const void *objp)
        /* We assume that ksize callers could use the whole allocated area,
         * so we need to unpoison this area.
         */
-       kasan_krealloc(objp, size, GFP_NOWAIT);
+       kasan_unpoison_shadow(objp, size);
 
        return size;
 }