Commit 23f61f0f authored by Walter Wu's avatar Walter Wu Committed by Linus Torvalds

kasan: record task_work_add() call stack

Why record task_work_add() call stack?  Syzbot reports many use-after-free
issues for task_work, see [1].  After seeing the free stack and the
current auxiliary stack, we think they are useless, we don't know where
the work was registered.  This work may be the free call stack, so we miss
the root cause and don't solve the use-after-free.

Add the task_work_add() call stack into the KASAN auxiliary stack in order
to improve KASAN reports.  It helps programmers solve use-after-free
issues.

[1]: https://groups.google.com/g/syzkaller-bugs/search?q=kasan%20use-after-free%20task_work_run

Link: https://lkml.kernel.org/r/20210316024410.19967-1-walter-zh.wu@mediatek.comSigned-off-by: default avatarWalter Wu <walter-zh.wu@mediatek.com>
Suggested-by: default avatarDmitry Vyukov <dvyukov@google.com>
Reviewed-by: default avatarDmitry Vyukov <dvyukov@google.com>
Reviewed-by: default avatarJens Axboe <axboe@kernel.dk>
Acked-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fc23c074
...@@ -34,6 +34,9 @@ int task_work_add(struct task_struct *task, struct callback_head *work, ...@@ -34,6 +34,9 @@ int task_work_add(struct task_struct *task, struct callback_head *work,
{ {
struct callback_head *head; struct callback_head *head;
/* record the work call stack in order to print it in KASAN reports */
kasan_record_aux_stack(work);
do { do {
head = READ_ONCE(task->task_works); head = READ_ONCE(task->task_works);
if (unlikely(head == &work_exited)) if (unlikely(head == &work_exited))
......
...@@ -163,7 +163,7 @@ struct kasan_alloc_meta { ...@@ -163,7 +163,7 @@ struct kasan_alloc_meta {
struct kasan_track alloc_track; struct kasan_track alloc_track;
#ifdef CONFIG_KASAN_GENERIC #ifdef CONFIG_KASAN_GENERIC
/* /*
* call_rcu() call stack is stored into struct kasan_alloc_meta. * The auxiliary stack is stored into struct kasan_alloc_meta.
* The free stack is stored into struct kasan_free_meta. * The free stack is stored into struct kasan_free_meta.
*/ */
depot_stack_handle_t aux_stack[2]; depot_stack_handle_t aux_stack[2];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment