Commit 5373b8a0 authored by Peter Collingbourne's avatar Peter Collingbourne Committed by Vlastimil Babka
Browse files

kasan: call kasan_malloc() from __kmalloc_*track_caller() 



We were failing to call kasan_malloc() from __kmalloc_*track_caller()
which was causing us to sometimes fail to produce KASAN error reports
for allocations made using e.g. devm_kcalloc(), as the KASAN poison was
not being initialized. Fix it.

Signed-off-by: default avatarPeter Collingbourne <pcc@google.com>
Cc: <stable@vger.kernel.org> # 5.15
Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
parent 7e9c323c

mm/slub.c

+4 −0
Original line number Diff line number Diff line
@@ -4926,6 +4926,8 @@ void *__kmalloc_track_caller(size_t size, gfp_t gfpflags, unsigned long caller) 
	/* Honor the call site pointer we received. */

	trace_kmalloc(caller, ret, s, size, s->size, gfpflags);



	ret = kasan_kmalloc(s, ret, size, gfpflags);



	return ret;

}

EXPORT_SYMBOL(__kmalloc_track_caller);
@@ -4957,6 +4959,8 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags, 
	/* Honor the call site pointer we received. */

	trace_kmalloc_node(caller, ret, s, size, s->size, gfpflags, node);



	ret = kasan_kmalloc(s, ret, size, gfpflags);



	return ret;

}

EXPORT_SYMBOL(__kmalloc_node_track_caller);