提交 6df0a690 编写于 作者: K Kees Cook 提交者: sanglipeng

panic: Consolidate open-coded panic_on_warn checks

stable inclusion
from stable-v5.10.166
commit 55eba18262cbc289ded9e7a8fe1b61a92140b59a
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7TH9O

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=55eba18262cbc289ded9e7a8fe1b61a92140b59a

--------------------------------

commit 79cc1ba7 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: NLuis Chamberlain <mcgrof@kernel.org>
Signed-off-by: NKees Cook <keescook@chromium.org>
Reviewed-by: NMarco Elver <elver@google.com>
Reviewed-by: NAndrey Konovalov <andreyknvl@gmail.com>
Link: https://lore.kernel.org/r/20221117234328.594699-4-keescook@chromium.orgSigned-off-by: NEric Biggers <ebiggers@google.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: Nsanglipeng <sanglipeng1@jd.com>
上级 13687b32
...@@ -336,6 +336,7 @@ extern long (*panic_blink)(int state); ...@@ -336,6 +336,7 @@ extern long (*panic_blink)(int state);
__printf(1, 2) __printf(1, 2)
void panic(const char *fmt, ...) __noreturn __cold; void panic(const char *fmt, ...) __noreturn __cold;
void nmi_panic(struct pt_regs *regs, const char *msg); 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_enter(void);
extern void oops_exit(void); extern void oops_exit(void);
extern bool oops_may_print(void); extern bool oops_may_print(void);
......
...@@ -630,8 +630,8 @@ void kcsan_report(const volatile void *ptr, size_t size, int access_type, ...@@ -630,8 +630,8 @@ void kcsan_report(const volatile void *ptr, size_t size, int access_type,
bool reported = value_change != KCSAN_VALUE_CHANGE_FALSE && bool reported = value_change != KCSAN_VALUE_CHANGE_FALSE &&
print_report(value_change, type, &ai, other_info); print_report(value_change, type, &ai, other_info);
if (reported && panic_on_warn) if (reported)
panic("panic_on_warn set ...\n"); check_panic_on_warn("KCSAN");
release_report(&flags, other_info); release_report(&flags, other_info);
} }
......
...@@ -192,6 +192,12 @@ static void panic_print_sys_info(void) ...@@ -192,6 +192,12 @@ static void panic_print_sys_info(void)
ftrace_dump(DUMP_ALL); 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 * panic - halt the system
* @fmt: The text string to print * @fmt: The text string to print
...@@ -657,8 +663,7 @@ void __warn(const char *file, int line, void *caller, unsigned taint, ...@@ -657,8 +663,7 @@ void __warn(const char *file, int line, void *caller, unsigned taint,
if (regs) if (regs)
show_regs(regs); show_regs(regs);
if (panic_on_warn) check_panic_on_warn("kernel");
panic("panic_on_warn set ...\n");
if (!regs) if (!regs)
dump_stack(); dump_stack();
......
...@@ -4707,8 +4707,7 @@ static noinline void __schedule_bug(struct task_struct *prev) ...@@ -4707,8 +4707,7 @@ static noinline void __schedule_bug(struct task_struct *prev)
pr_err("Preemption disabled at:"); pr_err("Preemption disabled at:");
print_ip_sym(KERN_ERR, preempt_disable_ip); print_ip_sym(KERN_ERR, preempt_disable_ip);
} }
if (panic_on_warn) check_panic_on_warn("scheduling while atomic");
panic("scheduling while atomic\n");
dump_stack(); dump_stack();
add_taint(TAINT_WARN, LOCKDEP_STILL_OK); add_taint(TAINT_WARN, LOCKDEP_STILL_OK);
......
...@@ -151,8 +151,7 @@ static void ubsan_epilogue(void) ...@@ -151,8 +151,7 @@ static void ubsan_epilogue(void)
current->in_ubsan--; current->in_ubsan--;
if (panic_on_warn) check_panic_on_warn("UBSAN");
panic("panic_on_warn set ...\n");
} }
static void handle_overflow(struct overflow_data *data, void *lhs, static void handle_overflow(struct overflow_data *data, void *lhs,
......
...@@ -97,8 +97,8 @@ static void end_report(unsigned long *flags, unsigned long addr) ...@@ -97,8 +97,8 @@ static void end_report(unsigned long *flags, unsigned long addr)
pr_err("==================================================================\n"); pr_err("==================================================================\n");
add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE); add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
spin_unlock_irqrestore(&report_lock, *flags); spin_unlock_irqrestore(&report_lock, *flags);
if (panic_on_warn && !test_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags)) if (!test_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags))
panic("panic_on_warn set ...\n"); check_panic_on_warn("KASAN");
kasan_enable_current(); kasan_enable_current();
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册