diff options
| author | Peter Collingbourne <pcc@google.com> | 2022-09-14 04:00:01 +0200 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2022-09-16 23:05:59 +0200 |
| commit | 5373b8a09d6e037ee0587cb5d9fe4cc09077deeb (patch) | |
| tree | 14d7ee978f14f59ac7e279bdbdbbab110574d144 /mm | |
| parent | mm/slub: fix to return errno if kmalloc() fails (diff) | |
| download | linux-5373b8a09d6e037ee0587cb5d9fe4cc09077deeb.tar.xz linux-5373b8a09d6e037ee0587cb5d9fe4cc09077deeb.zip | |
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: Peter Collingbourne <pcc@google.com>
Cc: <stable@vger.kernel.org> # 5.15
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slub.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/slub.c b/mm/slub.c index e6f3727b9ad2..5ba6db62a5ab 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -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); |