From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4EEF7C4332F for ; Fri, 18 Nov 2022 08:34:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9E6358E0001; Fri, 18 Nov 2022 03:34:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 995F66B0073; Fri, 18 Nov 2022 03:34:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 837A58E0001; Fri, 18 Nov 2022 03:34:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 74C236B0072 for ; Fri, 18 Nov 2022 03:34:14 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 59B7A1C61DE for ; Fri, 18 Nov 2022 08:34:14 +0000 (UTC) X-FDA: 80145900828.03.E41C7D1 Received: from mail-yw1-f170.google.com (mail-yw1-f170.google.com [209.85.128.170]) by imf05.hostedemail.com (Postfix) with ESMTP id EF53F100004 for ; Fri, 18 Nov 2022 08:34:13 +0000 (UTC) Received: by mail-yw1-f170.google.com with SMTP id 00721157ae682-3704852322fso43000217b3.8 for ; Fri, 18 Nov 2022 00:34:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=wyrIZGrkRGaBx3SBlr53l5QP2brkzSvBi6iVTIgs8bA=; b=p/97bDSMHPSl8KJZhheAqVfFItZr4N5ToAF1sL/eRnSDT78a47IjZqZRBiAf1ZRvOg StG+00tSdXWDsXeAgM1Yp4aXIAfaybTBv9cNAchnMtgmo5aXXMYFTmz0irktfNHmHGj6 HWDw/TPmRe0g0WB2Bn0IuhYCvVpx8PcVB34dJWrW/PoSrRDMyZ+v49sW/TslbSrrbRWe IuAekW2Aa1UflkJMuh4WDsqRlRIRZieQ1tAGqw8BHbmtlDXAtkrp9FB38PUidu9Tt9Mw +GTq7+MjLHDrW7xbA+tLEmVml4W+IkGZGuucNdqLMkzWITkL4uAGfzxdBda0MyxfbW0k GLmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=wyrIZGrkRGaBx3SBlr53l5QP2brkzSvBi6iVTIgs8bA=; b=RCQwzOVRj8NEQ7eoZSe4l8WnEcg19x8znEV78ej2EhfygA2tx+WRizhngDvm1Mhmzu sDvgChsr/ufMlRglUnqXNaWs3EyNe7SB7CudsPtg/JT+UqjE3132bVJE25S9JGnRwEcN 31Q/5s4uFnbvWKoIVHlTxVJSA+iwyuviIkNmZICksIJlrIaLeLKA4Q58ZpMUo8q/WyKq /dZW5FkvZr728ZGA6KAiIv+Uv60b7iHNhg/W/FBwpS99vYZnL7+wN0tPxaFOkO/9rnVt XMyQ7X44AkzrBzbqqQMYiu2QRW5b2B0K5wDBHHpgk92QpX5HpIpPrwSLAiPU9USH0hnR qglg== X-Gm-Message-State: ANoB5pmkq/b2gM5bNCFInfLgq2Tm6+5SXu0alBryJkFnIzzDBchFrKWv ss62Qndef/JuoaOM4bld5D3kgHRimiophUxSuqOc2Q== X-Google-Smtp-Source: AA0mqf6Kvf44HlZn6iojLaECPn2leREJv9EFhtuvAZO/Mw6881fUR5KToU610B8qLHSvq9W6O51u62BW9Qbmllua0rI= X-Received: by 2002:a81:1717:0:b0:36f:c0f7:856f with SMTP id 23-20020a811717000000b0036fc0f7856fmr5472096ywx.4.1668760453041; Fri, 18 Nov 2022 00:34:13 -0800 (PST) MIME-Version: 1.0 References: <20221117233838.give.484-kees@kernel.org> <20221117234328.594699-4-keescook@chromium.org> In-Reply-To: <20221117234328.594699-4-keescook@chromium.org> From: Marco Elver Date: Fri, 18 Nov 2022 09:33:36 +0100 Message-ID: Subject: Re: [PATCH v3 4/6] panic: Consolidate open-coded panic_on_warn checks To: Kees Cook Cc: Jann Horn , Dmitry Vyukov , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , Valentin Schneider , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Vincenzo Frascino , Andrew Morton , David Gow , tangmeng , Shuah Khan , Petr Mladek , "Paul E. McKenney" , Sebastian Andrzej Siewior , "Guilherme G. Piccoli" , Tiezhu Yang , kasan-dev@googlegroups.com, linux-mm@kvack.org, Luis Chamberlain , Seth Jenkins , Greg KH , Linus Torvalds , Andy Lutomirski , "Eric W. Biederman" , Arnd Bergmann , Jonathan Corbet , Baolin Wang , "Jason A. Donenfeld" , Eric Biggers , Huang Ying , Anton Vorontsov , Mauro Carvalho Chehab , Laurent Dufour , Rob Herring , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-hardening@vger.kernel.org Content-Type: text/plain; charset="UTF-8" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1668760454; a=rsa-sha256; cv=none; b=X19CPqyu2lJPtoSRK8nZagx7Y1eFLo6iIv0uVJrP1iB8G2BFhi0b1h9HdCHBJwY0mriA2j 4tlH0U/KDOYS8wcBget+IlL0Vtzx0Shjs+eUmNXH+3Y84+3m6ew732z+m1ezVX7jI70BHQ oj0cglfhUqpAsKii2iRO1kyJ6lp4YUA= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b="p/97bDSM"; spf=pass (imf05.hostedemail.com: domain of elver@google.com designates 209.85.128.170 as permitted sender) smtp.mailfrom=elver@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1668760454; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=wyrIZGrkRGaBx3SBlr53l5QP2brkzSvBi6iVTIgs8bA=; b=dMlkglaFpDnFaTkedl9T+aRHVO+qRoJudW3b+8l5/ZCk9w3vY+9x74Jd5y2YTO5E1ITLB9 aG1RJB7TmyhyT5mGFMt++yu0+FepBwE8y6X7lQ7MzrcKZeJuG0znm35YSROmHpAyRSntnJ 8K/uHHKgHMqWf4GTqc/+h2g9scH+t24= X-Stat-Signature: g6qub4gejd5cfg8ocamb1gno1zmbuine X-Rspamd-Queue-Id: EF53F100004 Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b="p/97bDSM"; spf=pass (imf05.hostedemail.com: domain of elver@google.com designates 209.85.128.170 as permitted sender) smtp.mailfrom=elver@google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1668760453-701469 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, 18 Nov 2022 at 00:43, Kees Cook wrote: > > 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 > Cc: Dmitry Vyukov > Cc: Ingo Molnar > Cc: Peter Zijlstra > Cc: Juri Lelli > Cc: Vincent Guittot > Cc: Dietmar Eggemann > Cc: Steven Rostedt > Cc: Ben Segall > Cc: Mel Gorman > Cc: Daniel Bristot de Oliveira > Cc: Valentin Schneider > Cc: Andrey Ryabinin > Cc: Alexander Potapenko > Cc: Andrey Konovalov > Cc: Vincenzo Frascino > Cc: Andrew Morton > Cc: David Gow > Cc: tangmeng > Cc: Jann Horn > Cc: Shuah Khan > Cc: Petr Mladek > Cc: "Paul E. McKenney" > Cc: Sebastian Andrzej Siewior > Cc: "Guilherme G. Piccoli" > Cc: Tiezhu Yang > Cc: kasan-dev@googlegroups.com > Cc: linux-mm@kvack.org > Reviewed-by: Luis Chamberlain > Signed-off-by: Kees Cook Reviewed-by: Marco Elver > --- > 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 >