Skip to content

Commit 1c61990

Browse files
xairyakpm00
authored andcommitted
kasan: fix bad call to unpoison_slab_object
Commit 29d7355 ("kasan: save alloc stack traces for mempool") messed up one of the calls to unpoison_slab_object: the last two arguments are supposed to be GFP flags and whether to init the object memory. Fix the call. Without this fix, __kasan_mempool_unpoison_object provides the object's size as GFP flags to unpoison_slab_object, which can cause LOCKDEP reports (and probably other issues). Link: https://lkml.kernel.org/r/[email protected] Fixes: 29d7355 ("kasan: save alloc stack traces for mempool") Signed-off-by: Andrey Konovalov <[email protected]> Reported-by: Brad Spengler <[email protected]> Acked-by: Marco Elver <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 34a023d commit 1c61990

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

mm/kasan/common.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ void __kasan_mempool_unpoison_object(void *ptr, size_t size, unsigned long ip)
532532
return;
533533

534534
/* Unpoison the object and save alloc info for non-kmalloc() allocations. */
535-
unpoison_slab_object(slab->slab_cache, ptr, size, flags);
535+
unpoison_slab_object(slab->slab_cache, ptr, flags, false);
536536

537537
/* Poison the redzone and save alloc info for kmalloc() allocations. */
538538
if (is_kmalloc_cache(slab->slab_cache))

0 commit comments

Comments
 (0)