anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Peter Collingbourne <pcc@google.com>
Cc: <stable@vger.kernel.org> # 5.15
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
(cherry picked from commit 5373b8a09d6e037ee0587cb5d9fe4cc09077deeb
 git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git for-6.0/fixes)
Change-Id: I597dd2d880b9b8b04a079d15a136bede855d9d00
Bug: 246029211
This commit is contained in:
Peter Collingbourne
2022-09-13 19:00:01 -07:00
committed by Todd Kjos
parent e1c0ed46cf
commit 41a23cd26e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mm/slub.c
View File

@@ -4934,6 +4934,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, size, s->size, gfpflags);
ret = kasan_kmalloc(s, ret, size, gfpflags);
return ret;
}
EXPORT_SYMBOL(__kmalloc_track_caller);
@@ -4965,6 +4967,8 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
/* Honor the call site pointer we received. */
trace_kmalloc_node(caller, ret, size, s->size, gfpflags, node);
ret = kasan_kmalloc(s, ret, size, gfpflags);
return ret;
}
EXPORT_SYMBOL(__kmalloc_node_track_caller);