From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Wed, 03 Jan 2024 09:43:39 +0000 Subject: [PATCH] update kernel to 5.10.198 --- kernel/mm/kasan/report.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/kernel/mm/kasan/report.c b/kernel/mm/kasan/report.c index 8fff182..13bdaac 100644 --- a/kernel/mm/kasan/report.c +++ b/kernel/mm/kasan/report.c @@ -92,16 +92,8 @@ pr_err("==================================================================\n"); add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE); spin_unlock_irqrestore(&report_lock, *flags); - if (panic_on_warn && !test_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags)) { - /* - * This thread may hit another WARN() in the panic path. - * Resetting this prevents additional WARN() from panicking the - * system on this thread. Other threads are blocked by the - * panic_mutex in panic(). - */ - panic_on_warn = 0; - panic("panic_on_warn set ...\n"); - } + if (!test_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags)) + check_panic_on_warn("KASAN"); #ifdef CONFIG_KASAN_HW_TAGS if (kasan_flag_panic) panic("kasan.fault=panic set ...\n"); -- Gitblit v1.6.2