diff options
| author | Jared Kangas <jkangas@redhat.com> | 2024-11-19 13:02:34 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-12-14 19:54:50 +0100 |
| commit | 74b6d260cb7a62c370e31f4ad1ae3177510d0497 (patch) | |
| tree | 5554ac4ddea984898c1ff2e83207b88a4622891f | |
| parent | ac77fe0577ca694d7689bb60da939dc8d25fa2dd (diff) | |
| download | linux-74b6d260cb7a62c370e31f4ad1ae3177510d0497.tar.gz linux-74b6d260cb7a62c370e31f4ad1ae3177510d0497.tar.bz2 linux-74b6d260cb7a62c370e31f4ad1ae3177510d0497.zip | |
kasan: make report_lock a raw spinlock
[ Upstream commit e30a0361b8515d424c73c67de1a43e45a13b8ba2 ]
If PREEMPT_RT is enabled, report_lock is a sleeping spinlock and must not
be locked when IRQs are disabled. However, KASAN reports may be triggered
in such contexts. For example:
char *s = kzalloc(1, GFP_KERNEL);
kfree(s);
local_irq_disable();
char c = *s; /* KASAN report here leads to spin_lock() */
local_irq_enable();
Make report_spinlock a raw spinlock to prevent rescheduling when
PREEMPT_RT is enabled.
Link: https://lkml.kernel.org/r/20241119210234.1602529-1-jkangas@redhat.com
Fixes: 342a93247e08 ("locking/spinlock: Provide RT variant header: <linux/spinlock_rt.h>")
Signed-off-by: Jared Kangas <jkangas@redhat.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | mm/kasan/report.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 821cd12e8c8a..6ad986c267b5 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -173,7 +173,7 @@ static void update_kunit_status(bool sync) static void update_kunit_status(bool sync) { } #endif -static DEFINE_SPINLOCK(report_lock); +static DEFINE_RAW_SPINLOCK(report_lock); static void start_report(unsigned long *flags, bool sync) { @@ -185,7 +185,7 @@ static void start_report(unsigned long *flags, bool sync) lockdep_off(); /* Make sure we don't end up in loop. */ report_suppress_start(); - spin_lock_irqsave(&report_lock, *flags); + raw_spin_lock_irqsave(&report_lock, *flags); pr_err("==================================================================\n"); } @@ -195,7 +195,7 @@ static void end_report(unsigned long *flags, void *addr) trace_error_report_end(ERROR_DETECTOR_KASAN, (unsigned long)addr); pr_err("==================================================================\n"); - spin_unlock_irqrestore(&report_lock, *flags); + raw_spin_unlock_irqrestore(&report_lock, *flags); if (!test_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags)) check_panic_on_warn("KASAN"); if (kasan_arg_fault == KASAN_ARG_FAULT_PANIC) |