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 F2BE4C64EC4 for ; Fri, 3 Feb 2023 00:28:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 383B06B0074; Thu, 2 Feb 2023 19:28:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 332A36B0073; Thu, 2 Feb 2023 19:28:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1D3F96B0074; Thu, 2 Feb 2023 19:28:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 0EEAA6B0071 for ; Thu, 2 Feb 2023 19:28:14 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id CDCB7C0708 for ; Fri, 3 Feb 2023 00:28:13 +0000 (UTC) X-FDA: 80424093666.23.438E399 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf25.hostedemail.com (Postfix) with ESMTP id 2933CA0006 for ; Fri, 3 Feb 2023 00:28:10 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=GrN8c1zq; spf=pass (imf25.hostedemail.com: domain of ebiggers@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=ebiggers@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675384091; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=P64sEEgdXAcZEgqwS2XBi6yNzsTXCiHZWWCCaDmfkWI=; b=vIUp3Hqi7I261iyzXlksZkrG1RdR4iEXAOrijZ93urIMj3r5AeYL/AZ39cysnHNLTSfRi4 s0RaTR9YPw/cc44pUIIYMFfX+Hm4HHDXpbh+QROjprlawD3TnVp/vacxw40i18Dz+ln3OP AahLlMg54U39pQ1IxnY8gDH7CS3qQc8= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=GrN8c1zq; spf=pass (imf25.hostedemail.com: domain of ebiggers@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=ebiggers@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675384091; a=rsa-sha256; cv=none; b=dpMMjb3T07grIIpvxudA17USSqOQaoZCNfTW0aK4S7KRI3c2XxediZ0SWSkDQkI45Qbk/C nu6Z1a1vREh+tVNTjuPHl4D7BjHylzrDCZGEJm+0r4Se9dsDSmgLbie1KaNRQMDrVWEnhm qqiJ9fWO4DSj4XK2VEUjwH4vr9rJ9Dw= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4073461D48; Fri, 3 Feb 2023 00:28:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6B3DC433EF; Fri, 3 Feb 2023 00:28:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675384089; bh=uR+rWazLwbtNzV99k2M2cRim465eq897QVUvq4Ip/WY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GrN8c1zq+J+itxtunkdMTASPZg3ADtKBZAoYkr5TDGJnnVIXeFU58Tj7z0Tk0OQWl cdPhkafoM3qHSPg/G4FqZwCFBOVREy+4vmcsZBuaE7BKER/x6bAHvCxLzNheJvIHO+ 87K1PrwD/bskFQRy6EzWeoyigHHdWmmLgrN5lURl0B+IOWwnHXigvRbMZT+rPWuADu AhyB7bUO4yTzLYhqHYPz8nFcIF+rxSRm+zaiRvGI2WqZoanyIgBEZ0bKoY9On1MAkS sXv+I+bXzQlKd6L3stJdGVJTfb086t+szFLDUNsMemTi+8/47v5/j/+HMBOUyB8Erk 5sLGxv6kzY0oQ== From: Eric Biggers To: stable@vger.kernel.org Cc: Harshit Mogalapalli , Kees Cook , SeongJae Park , Seth Jenkins , Jann Horn , "Eric W . Biederman" , linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org, Marco Elver , 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 Subject: [PATCH 4.19 v2 11/15] panic: Consolidate open-coded panic_on_warn checks Date: Thu, 2 Feb 2023 16:27:13 -0800 Message-Id: <20230203002717.49198-12-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230203002717.49198-1-ebiggers@kernel.org> References: <20230203002717.49198-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: kssxdbc8i5yeu4t171p3xdpaohi1y9gh X-Rspamd-Queue-Id: 2933CA0006 X-HE-Tag: 1675384090-593005 X-HE-Meta: U2FsdGVkX19hzcGTFxu8SPg3z4cQCPSFW3jEhalBZw886JwhQq6LLrb3I05H3Ta8pMHcAipaJ+se1MvcE/P0NTd96EEITPkvYHEbshX/FAHg0M2ZFbIlsIIx8B/xClxOUBBA+2sdPexJvb4Q4CgFrZbBuiPklh7hNmc6hyRnQkLvFLM5XhixN+C72RGWWoMrPy4BtjkesJU1Kv3Q3QgaMVX6oYQW+GHev0dviCnu9XS0+ikkB5xu6IdOZWy9Nlt6oduJFJoD+Mwu+3HmGkERZFG5dyLkA4LdyNbtyGzlenjA3qNf21ZoDDoyutzwcKA5OY+6LorLdN+aVpAU849NGOFrfOdwSeqHjq8yOG9xfHNp8pnrLTEcGl7KENJpeqzYIdxdtA7JWCo38XvxDGl2qamii0dMoPykVLWO31SlL2Hopv8rN8CKeqbjUNiW3m+h3pmbB1GF9FAalYCJnNt7FGJAty+G4Gbz594UZWDpnQZFei5l61CI2GU9aXL8z+yJ1A4AcksxreRxziqHjTK6q3TX1mxnd0kHaM2xQDDNLtaNV1t7Fy+fOPRCfIyFArgU2+iQ2lT6kV+hkuAo39HsZWtqJYzh8to6M7O1JDlNNOtZBj7tuGFWMSUTdDbEOwsGzdWBlH4IlokjkUFSjwqwyQke1HkwjPfSxLAgKp1liT4+1Cl7PaR30bOduNnjv/YLp+0+KUVpbgoxMDk51pEGefOl6y5fvc/geTTB1QccFxatngn1ONrq9w/TXo7i5A9LByi8+oV/rar1liZx/SUcWEb8krXPmHN96w+5XGO/J1tSAC9iOh83ZkXHalOlOUepaEEirgGr0FoXVUn5NZ6bKw9n6XzVq1Lpw65CXe3YaV9Eu3ACyGH9arHxDWTbT/7SMYLVXuoxtjWXj8YF+tbQ3gWZN90zv3y1Hlg4NhIY8ipgAM9+KnGiNPdGBea+mnA27mYaJlpdobatYhNZtRf VsNptdt6 zwFFmp+cDhImYCN9VCAD5MHiKnvvFTH1l36zuY26afYKdfCZPzJeYfTLSelFqiQSZ3frIqbXDWV10r39Dm1ploVok4eEGzKm1XN7LsTjKyeXowmvRe45QQZWXA+XWL9nWeaKeEUOl7ViVNIQUI7+meRIWCeAzPMk5C2YS8wMTRRPwciwkNzFkAMT+61LijxeTtM9quUBV7hVHF4ZVisWODkTR6f+kyUMFGJmYQQGcNM4lmBH0sO+25txebp83xmcJcodaWOqOMAbZ5F6CBIVOjahaALTaCqHb3GFYuHOkS1XMo9cpL0YOhU1bbwrQCeYqcMmJ1FJGs+hET2HrDwscr3YUnJ0idLfEA3Qu6TJgixjh3H61r8HmITbeFHvwGYBWLjq78li+L4F/JgDLPLyt+3DEeNHRwiDIc0DftPG5cUM1/Qhbxl7RUbM5NMcFqgQqMKe1RgqVoU/J+4c2vMYh9s3VVpOu201CQ9E3YqdKIbDuLE2IRFRBIC2V2KcdGIx39WzGwhL9thg///iLBZi/XCaFwC3j3eMknhU5NA/RLNu7n6Bcpi0fSp4yhUBvKHWscddoZgyR4HdqQBXB8MLvIesVACYF13Y7EF5Oe2HNkOucxUT/6IaJjBE69KpkLRDSIC+WxPVpf2kKQUktIUh5lI8bWKZW1bUg9s1JVAQttwDauJ1wfnNwODoHvAw0iL+kR+V7DpmrjhwuPe4XpkFdNcopDHfDJQs25MvQbV7JSORtYa23As++DCi0bWJHZkDXqBh/V4NPI+9ODikDwoX0gVqGBrYDB0pdXNBDpNtEoz0tZ5a+BpxrRUxGuoUiETausYgXKxsJHFkGHzodMrsxkwK3RpOp9FjjA4tRAHdX5RTktwT5PlarSLWJZdCT3wlngCc38UqvVLxFkU07tdn0aWtvXBrKpIL6sK4f81JCSXi5pJRUMlPxtFDpoU9qSlXQW7oq+MkWNI1pF4YL/5scfHkbVzcb qOZk5hsm JUh7zUXV5qNKss/tRo+Dc+KGYdT1Ecg9KKy7cG9BbznK+sJhtzDRSBrh0pjBGyVFOaJjn/KPULqi2FlmbVHdeka/lWyhPrSg4ouKQk2UfpqehT5NVj57JPsmx/3qvx5cRWp8HFuBxKT4605qwxoE6tMj4+Nq4Oi2PNQWw0tfGbv2exkI5BgpyKCgZeCrArRWmyBzgZESq8hx7wQtGiKpd2UMrtMCE5GaPUG0d53VifQhap0U0227h9hTgeJjHw3s2fmq0IENIZU= 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: From: Kees Cook 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 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 Reviewed-by: Andrey Konovalov Link: https://lore.kernel.org/r/20221117234328.594699-4-keescook@chromium.org Signed-off-by: Eric Biggers --- include/linux/kernel.h | 1 + kernel/panic.c | 9 +++++++-- kernel/sched/core.c | 3 +-- mm/kasan/report.c | 3 +-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 50733abbe548e..a28ec4c2f3f5a 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -327,6 +327,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); diff --git a/kernel/panic.c b/kernel/panic.c index a078d413042f2..08b8adc55b2bf 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -125,6 +125,12 @@ void nmi_panic(struct pt_regs *regs, const char *msg) } EXPORT_SYMBOL(nmi_panic); +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 @@ -540,8 +546,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(); diff --git a/kernel/sched/core.c b/kernel/sched/core.c index a034642497718..46227cc48124d 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3316,8 +3316,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); diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 5c169aa688fde..3ae996824a040 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -176,8 +176,7 @@ static void kasan_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) - panic("panic_on_warn set ...\n"); + check_panic_on_warn("KASAN"); kasan_enable_current(); } -- 2.39.1