Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51538bdd authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

panic: Consolidate open-coded panic_on_warn checks 



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.

Cc: Marco Elver <elver@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Juri Lelli <juri.lelli@redhat.com>
Cc: Vincent Guittot <vincent.guittot@linaro.org>
Cc: Dietmar Eggemann <dietmar.eggemann@arm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ben Segall <bsegall@google.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Daniel Bristot de Oliveira <bristot@redhat.com>
Cc: Valentin Schneider <vschneid@redhat.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: David Gow <davidgow@google.com>
Cc: tangmeng <tangmeng@uniontech.com>
Cc: Jann Horn <jannh@google.com>
Cc: Shuah Khan <skhan@linuxfoundation.org>
Cc: Petr Mladek <pmladek@suse.com>
Cc: "Paul E. McKenney" <paulmck@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: "Guilherme G. Piccoli" <gpiccoli@igalia.com>
Cc: Tiezhu Yang <yangtiezhu@loongson.cn>
Cc: kasan-dev@googlegroups.com
Cc: linux-mm@kvack.org
Reviewed-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarMarco Elver <elver@google.com>
Reviewed-by: default avatarAndrey Konovalov <andreyknvl@gmail.com>
Link: https://lore.kernel.org/r/20221117234328.594699-4-keescook@chromium.org


Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7020a923

include/linux/kernel.h

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,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);

void print_oops_end_marker(void);

kernel/panic.c

+7 −2
Original line number Diff line number Diff line
@@ -156,6 +156,12 @@ static void panic_print_sys_info(void) 
		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
@@ -581,8 +587,7 @@ void __warn(const char *file, int line, void *caller, unsigned taint, 
	if (args)

		vprintk(args->fmt, args->args);



	if (panic_on_warn)

		panic("panic_on_warn set ...\n");

	check_panic_on_warn("kernel");



	print_modules();

kernel/sched/core.c

+1 −2
Original line number Diff line number Diff line
@@ -3964,8 +3964,7 @@ static noinline void __schedule_bug(struct task_struct *prev) 
		print_ip_sym(preempt_disable_ip);

		pr_cont("\n");

	}

	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);

mm/kasan/report.c

+2 −2
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ static void end_report(unsigned long *flags) 
	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))

		panic("panic_on_warn set ...\n");

	if (!test_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags))

		check_panic_on_warn("KASAN");

	kasan_enable_current();

}