Skip to content

Commit

Permalink
panic: Consolidate open-coded panic_on_warn checks
Browse files Browse the repository at this point in the history
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.

Cc: Marco Elver <[email protected]>
Cc: Dmitry Vyukov <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Juri Lelli <[email protected]>
Cc: Vincent Guittot <[email protected]>
Cc: Dietmar Eggemann <[email protected]>
Cc: Steven Rostedt <[email protected]>
Cc: Ben Segall <[email protected]>
Cc: Mel Gorman <[email protected]>
Cc: Daniel Bristot de Oliveira <[email protected]>
Cc: Valentin Schneider <[email protected]>
Cc: Andrey Ryabinin <[email protected]>
Cc: Alexander Potapenko <[email protected]>
Cc: Andrey Konovalov <[email protected]>
Cc: Vincenzo Frascino <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: David Gow <[email protected]>
Cc: tangmeng <[email protected]>
Cc: Jann Horn <[email protected]>
Cc: Shuah Khan <[email protected]>
Cc: Petr Mladek <[email protected]>
Cc: "Paul E. McKenney" <[email protected]>
Cc: Sebastian Andrzej Siewior <[email protected]>
Cc: "Guilherme G. Piccoli" <[email protected]>
Cc: Tiezhu Yang <[email protected]>
Cc: [email protected]
Cc: [email protected]
Reviewed-by: Luis Chamberlain <[email protected]>
Signed-off-by: Kees Cook <[email protected]>
Reviewed-by: Marco Elver <[email protected]>
Reviewed-by: Andrey Konovalov <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
  • Loading branch information
kees committed Dec 2, 2022
1 parent de92f65 commit 79cc1ba
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 12 deletions.
1 change: 1 addition & 0 deletions include/linux/panic.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions kernel/kcsan/report.c
Original file line number Diff line number Diff line change
Expand Up @@ -492,8 +492,7 @@ static void print_report(enum kcsan_value_change value_change,
dump_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)
Expand Down
9 changes: 7 additions & 2 deletions kernel/panic.c
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,12 @@ static void panic_print_sys_info(bool console_flush)
ftrace_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
Expand Down Expand Up @@ -619,8 +625,7 @@ void __warn(const char *file, int line, void *caller, unsigned taint,
if (regs)
show_regs(regs);

if (panic_on_warn)
panic("panic_on_warn set ...\n");
check_panic_on_warn("kernel");

if (!regs)
dump_stack();
Expand Down
3 changes: 1 addition & 2 deletions kernel/sched/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -5729,8 +5729,7 @@ static noinline void __schedule_bug(struct task_struct *prev)
pr_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);
Expand Down
3 changes: 1 addition & 2 deletions lib/ubsan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions mm/kasan/report.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ static void end_report(unsigned long *flags, void *addr)
(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);
Expand Down
3 changes: 1 addition & 2 deletions mm/kfence/report.c
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,7 @@ void kfence_report_error(unsigned long address, bool is_write, struct pt_regs *r

lockdep_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);
Expand Down

0 comments on commit 79cc1ba

Please sign in to comment.