kasan-handle-concurrent-kasan_record_aux_stack-calls.patch removed from -mm tree
The quilt patch titled
Subject: kasan: handle concurrent kasan_record_aux_stack calls
has been removed from the -mm tree. Its filename was
kasan-handle-concurrent-kasan_record_aux_stack-calls.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Andrey Konovalov <[email protected]>
Subject: kasan: handle concurrent kasan_record_aux_stack calls
Date: Tue, 19 Dec 2023 22:19:51 +0100
kasan_record_aux_stack can be called concurrently on the same object. This might lead to a race condition when rotating the saved aux stack trace handles, which in turns leads to incorrect accounting of stack depot handles and refcount underflows in the stack depot code.
Fix by introducing a raw spinlock to protect the aux stack trace handles in kasan_record_aux_stack.
---
mm/kasan/generic.c | 32 +++++++++++++++++++++++++++++--- mm/kasan/kasan.h | 8 ++++++++ 2 files changed, 37 insertions(+), 3 deletions(-)
mm/kasan/generic.c renamed from mm/kasan/generic.c~kasan-handle-concurrent-kasan_record_aux_stack-calls +29 -3
@@ -25,6 +25,7 @@#include <linux/sched.h> #include <linux/sched/task_stack.h> #include <linux/slab.h> +#include <linux/spinlock.h> #include <linux/stackdepot.h> #include <linux/stacktrace.h> #include <linux/string.h>
@@ -471,8 +472,18 @@ void kasan_init_object_meta(struct kmem_struct kasan_free_meta *free_meta; alloc_meta =kasan_get_alloc_meta (cache, object); -if (alloc_meta) +if (alloc_meta) {__memset (alloc_meta,0 ,sizeof (*alloc_meta)); + +/* +* Temporarily disable KASAN bug reporting to allow instrumented +* raw_spin_lock_init to access aux_lock, which resides inside +* of a redzone. +*/ +kasan_disable_current (); +raw_spin_lock_init (&alloc_meta->aux_lock); +kasan_enable_current (); + } free_meta =kasan_get_free_meta (cache, object);if (free_meta)__memset (free_meta,0 ,sizeof (*free_meta));
@@ -502,6 +513,8 @@ static void __kasan_record_aux_stack(voistruct kmem_cache *cache;struct kasan_alloc_meta *alloc_meta;void *object; +depot_stack_handle_t new_handle, old_handle; +unsigned long flags;if (is_kfence_address (addr) || !slab)return ;
@@ -512,9 +525,22 @@ static void __kasan_record_aux_stack(voiif (!alloc_meta)return ; -stack_depot_put (alloc_meta->aux_stack[1 ]); + new_handle =kasan_save_stack (0 , depot_flags); + +/* +* Temporarily disable KASAN bug reporting to allow instrumented +* spinlock functions to access aux_lock, which resides inside of a +* redzone. +*/ +kasan_disable_current (); +raw_spin_lock_irqsave (&alloc_meta->aux_lock, flags); + old_handle = alloc_meta->aux_stack[1 ]; alloc_meta->aux_stack[1 ] = alloc_meta->aux_stack[0 ]; - alloc_meta->aux_stack[0 ] =kasan_save_stack (0 , depot_flags); + alloc_meta->aux_stack[0 ] = new_handle; +raw_spin_unlock_irqrestore (&alloc_meta->aux_lock, flags); +kasan_enable_current (); + +stack_depot_put (old_handle); }void kasan_record_aux_stack (void *addr)
mm/kasan/kasan.h renamed from mm/kasan/kasan.h~kasan-handle-concurrent-kasan_record_aux_stack-calls +8 -0
@@ -6,6 +6,7 @@#include <linux/kasan.h> #include <linux/kasan-tags.h> #include <linux/kfence.h> +#include <linux/spinlock.h> #include <linux/stackdepot.h> #if defined(CONFIG_KASAN_SW_TAGS ) || defined(CONFIG_KASAN_HW_TAGS )
@@ -249,6 +250,13 @@ struct kasan_global {struct kasan_alloc_meta {struct kasan_track alloc_track;/* Free track is stored in kasan_free_meta. */ +/* +* aux_lock protects aux_stack from accesses from concurrent +* kasan_record_aux_stack calls. It is a raw spinlock to avoid sleeping +* on RT kernels, as kasan_record_aux_stack_noalloc can be called from +* non-sleepable contexts. +*/ +raw_spinlock_t aux_lock;depot_stack_handle_t aux_stack[2 ]; };
_
Patches currently in -mm which might be from [email protected] are
kasan-stop-leaking-stack-trace-handles.patch