Patch "panic: Consolidate open-coded panic_on_warn checks" has been added to the 6.1-stable tree
Subsystems (7)
[email protected]
AppliedThis is a note to let you know that I've just added the patch titled
panic: Consolidate open-coded panic_on_warn checks
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
panic-consolidate-open-coded-panic_on_warn-checks.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From 79cc1ba7badf9e7a12af99695a557e9ce27ee967 Mon Sep 17 00:00:00 2001
From: Kees Cook <[email protected]>
Date: Thu, 17 Nov 2022 15:43:24 -0800
Subject: panic: Consolidate open-coded panic_on_warn checks
From: Kees Cook <[email protected]>
commit 79cc1ba7badf9e7a12af99695a557e9ce27ee967 upstream.
Several run-time checkers (KASAN, UBSAN, KFENCE, KCSAN, sched) roll their own warnings, and each check "panic_on_warn". Consolidate this into a single function so that future instrumentation can be added in a single location.
--- include/linux/panic.h | 1 + kernel/kcsan/report.c | 3 +-- kernel/panic.c | 9 +++++++-- kernel/sched/core.c | 3 +-- lib/ubsan.c | 3 +-- mm/kasan/report.c | 4 ++-- mm/kfence/report.c | 3 +-- 7 files changed, 14 insertions(+), 12 deletions(-)
include/linux/panic.h +1 -0
@@ -11,6 +11,7 @@ extern long (*panic_blink)(int state); __printf(1, 2)void panic (const char *fmt, ...)__noreturn __cold ;void nmi_panic (struct pt_regs *regs,const char *msg); +void check_panic_on_warn (const char *origin);extern void oops_enter (void );extern void oops_exit (void );extern bool oops_may_print (void );
kernel/kcsan/report.c +1 -2
@@ -492,8 +492,7 @@ static void print_report(enum kcsan_valudump_stack_print_info (KERN_DEFAULT );pr_err ("==================================================================\n" ); -if (panic_on_warn) -panic ("panic_on_warn set ...\n" ); +check_panic_on_warn ("KCSAN" ); }static void release_report (unsigned long *flags,struct other_info *other_info)
kernel/panic.c +7 -2
@@ -201,6 +201,12 @@ static void panic_print_sys_info(bool coftrace_dump (DUMP_ALL ); } +void check_panic_on_warn (const char *origin) +{ +if (panic_on_warn) +panic ("%s: panic_on_warn set ...\n" , origin); +} +/** * panic - halt the system * @fmt: The text string to print
@@ -619,8 +625,7 @@ void __warn(const char *file, int line,if (regs)show_regs (regs); -if (panic_on_warn) -panic ("panic_on_warn set ...\n" ); +check_panic_on_warn ("kernel" );if (!regs)dump_stack ();
kernel/sched/core.c +1 -2
@@ -5778,8 +5778,7 @@ static noinline void __schedule_bug(strupr_err ("Preemption disabled at:" );print_ip_sym (KERN_ERR , preempt_disable_ip); } -if (panic_on_warn) -panic ("scheduling while atomic\n" ); +check_panic_on_warn ("scheduling while atomic" );dump_stack ();add_taint (TAINT_WARN ,LOCKDEP_STILL_OK );
lib/ubsan.c +1 -2
@@ -154,8 +154,7 @@ static void ubsan_epilogue(void) current->in_ubsan--; -if (panic_on_warn) -panic ("panic_on_warn set ...\n" ); +check_panic_on_warn ("UBSAN" ); }void __ubsan_handle_divrem_overflow (void *_data,void *lhs,void *rhs)
mm/kasan/report.c +2 -2
@@ -164,8 +164,8 @@ static void end_report(unsigned long *fl (unsigned long)addr);pr_err ("==================================================================\n" );spin_unlock_irqrestore (&report_lock, *flags); -if (panic_on_warn && !test_bit (KASAN_BIT_MULTI_SHOT , &kasan_flags)) -panic ("panic_on_warn set ...\n" ); +if (!test_bit (KASAN_BIT_MULTI_SHOT , &kasan_flags)) +check_panic_on_warn ("KASAN" );if (kasan_arg_fault ==KASAN_ARG_FAULT_PANIC )panic ("kasan.fault=panic set ...\n" );add_taint (TAINT_BAD_PAGE ,LOCKDEP_NOW_UNRELIABLE );
mm/kfence/report.c +1 -2
@@ -273,8 +273,7 @@ void kfence_report_error(unsigned long alockdep_on (); -if (panic_on_warn) -panic ("panic_on_warn set ...\n" ); +check_panic_on_warn ("KFENCE" );/* We encountered a memory safety error, taint the kernel! */ add_taint (TAINT_BAD_PAGE ,LOCKDEP_STILL_OK );
Patches currently in stable-queue which might be from [email protected] are
queue-6.1/panic-consolidate-open-coded-panic_on_warn-checks.patch queue-6.1/exit-put-an-upper-limit-on-how-often-we-can-oops.patch queue-6.1/panic-introduce-warn_limit.patch queue-6.1/exit-allow-oops_limit-to-be-disabled.patch queue-6.1/panic-separate-sysctl-logic-from-config_smp.patch queue-6.1/exit-use-read_once-for-all-oops-warn-limit-reads.patch queue-6.1/exit-expose-oops_count-to-sysfs.patch queue-6.1/panic-expose-warn_count-to-sysfs.patch queue-6.1/docs-fix-path-paste-o-for-sys-kernel-warn_count.patch