lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 17 Nov 2022 15:43:24 -0800 From: Kees Cook <keescook@...omium.org> To: Jann Horn <jannh@...gle.com> Cc: Kees Cook <keescook@...omium.org>, Marco Elver <elver@...gle.com>, Dmitry Vyukov <dvyukov@...gle.com>, Ingo Molnar <mingo@...hat.com>, Peter Zijlstra <peterz@...radead.org>, Juri Lelli <juri.lelli@...hat.com>, Vincent Guittot <vincent.guittot@...aro.org>, Dietmar Eggemann <dietmar.eggemann@....com>, Steven Rostedt <rostedt@...dmis.org>, Ben Segall <bsegall@...gle.com>, Mel Gorman <mgorman@...e.de>, Daniel Bristot de Oliveira <bristot@...hat.com>, Valentin Schneider <vschneid@...hat.com>, Andrey Ryabinin <ryabinin.a.a@...il.com>, Alexander Potapenko <glider@...gle.com>, Andrey Konovalov <andreyknvl@...il.com>, Vincenzo Frascino <vincenzo.frascino@....com>, Andrew Morton <akpm@...ux-foundation.org>, David Gow <davidgow@...gle.com>, tangmeng <tangmeng@...ontech.com>, Shuah Khan <skhan@...uxfoundation.org>, Petr Mladek <pmladek@...e.com>, "Paul E. McKenney" <paulmck@...nel.org>, Sebastian Andrzej Siewior <bigeasy@...utronix.de>, "Guilherme G. Piccoli" <gpiccoli@...lia.com>, Tiezhu Yang <yangtiezhu@...ngson.cn>, kasan-dev@...glegroups.com, linux-mm@...ck.org, Luis Chamberlain <mcgrof@...nel.org>, Seth Jenkins <sethjenkins@...gle.com>, Greg KH <gregkh@...uxfoundation.org>, Linus Torvalds <torvalds@...uxfoundation.org>, Andy Lutomirski <luto@...nel.org>, "Eric W. Biederman" <ebiederm@...ssion.com>, Arnd Bergmann <arnd@...db.de>, Jonathan Corbet <corbet@....net>, Baolin Wang <baolin.wang@...ux.alibaba.com>, "Jason A. Donenfeld" <Jason@...c4.com>, Eric Biggers <ebiggers@...gle.com>, Huang Ying <ying.huang@...el.com>, Anton Vorontsov <anton@...msg.org>, Mauro Carvalho Chehab <mchehab+huawei@...nel.org>, Laurent Dufour <ldufour@...ux.ibm.com>, Rob Herring <robh@...nel.org>, linux-kernel@...r.kernel.org, linux-doc@...r.kernel.org, linux-hardening@...r.kernel.org Subject: [PATCH v3 4/6] panic: Consolidate open-coded panic_on_warn checks 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@...gle.com> Cc: Dmitry Vyukov <dvyukov@...gle.com> Cc: Ingo Molnar <mingo@...hat.com> Cc: Peter Zijlstra <peterz@...radead.org> Cc: Juri Lelli <juri.lelli@...hat.com> Cc: Vincent Guittot <vincent.guittot@...aro.org> Cc: Dietmar Eggemann <dietmar.eggemann@....com> Cc: Steven Rostedt <rostedt@...dmis.org> Cc: Ben Segall <bsegall@...gle.com> Cc: Mel Gorman <mgorman@...e.de> Cc: Daniel Bristot de Oliveira <bristot@...hat.com> Cc: Valentin Schneider <vschneid@...hat.com> Cc: Andrey Ryabinin <ryabinin.a.a@...il.com> Cc: Alexander Potapenko <glider@...gle.com> Cc: Andrey Konovalov <andreyknvl@...il.com> Cc: Vincenzo Frascino <vincenzo.frascino@....com> Cc: Andrew Morton <akpm@...ux-foundation.org> Cc: David Gow <davidgow@...gle.com> Cc: tangmeng <tangmeng@...ontech.com> Cc: Jann Horn <jannh@...gle.com> Cc: Shuah Khan <skhan@...uxfoundation.org> Cc: Petr Mladek <pmladek@...e.com> Cc: "Paul E. McKenney" <paulmck@...nel.org> Cc: Sebastian Andrzej Siewior <bigeasy@...utronix.de> Cc: "Guilherme G. Piccoli" <gpiccoli@...lia.com> Cc: Tiezhu Yang <yangtiezhu@...ngson.cn> Cc: kasan-dev@...glegroups.com Cc: linux-mm@...ck.org Reviewed-by: Luis Chamberlain <mcgrof@...nel.org> Signed-off-by: Kees Cook <keescook@...omium.org> --- 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(-) diff --git a/include/linux/panic.h b/include/linux/panic.h index c7759b3f2045..979b776e3bcb 100644 --- a/include/linux/panic.h +++ b/include/linux/panic.h @@ -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); diff --git a/kernel/kcsan/report.c b/kernel/kcsan/report.c index 67794404042a..e95ce7d7a76e 100644 --- a/kernel/kcsan/report.c +++ b/kernel/kcsan/report.c @@ -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) diff --git a/kernel/panic.c b/kernel/panic.c index d843d036651e..cfa354322d5f 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -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 @@ -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(); diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 5800b0623ff3..285ef8821b4f 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -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); diff --git a/lib/ubsan.c b/lib/ubsan.c index 36bd75e33426..60c7099857a0 100644 --- a/lib/ubsan.c +++ b/lib/ubsan.c @@ -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) diff --git a/mm/kasan/report.c b/mm/kasan/report.c index df3602062bfd..cc98dfdd3ed2 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -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); diff --git a/mm/kfence/report.c b/mm/kfence/report.c index 7e496856c2eb..110c27ca597d 100644 --- a/mm/kfence/report.c +++ b/mm/kfence/report.c @@ -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); -- 2.34.1
Powered by blists - more mailing lists