From patchwork Thu Feb 2 04:42:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 13125269 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 C7FBAC6379F for ; Thu, 2 Feb 2023 04:44:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2221B6B0071; Wed, 1 Feb 2023 23:44:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1D1976B0072; Wed, 1 Feb 2023 23:44:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 073386B0073; Wed, 1 Feb 2023 23:44:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id EBE2E6B0071 for ; Wed, 1 Feb 2023 23:44:00 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id BB0F2120C67 for ; Thu, 2 Feb 2023 04:44:00 +0000 (UTC) X-FDA: 80421109440.23.563F7F7 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf20.hostedemail.com (Postfix) with ESMTP id 669091C0006 for ; Thu, 2 Feb 2023 04:43:57 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Sf+IENLZ; spf=pass (imf20.hostedemail.com: domain of ebiggers@kernel.org designates 145.40.68.75 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=1675313037; 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=1d6U6SvfkV1Q4VXNQw/YmTFmTyuRguphtqdsa72EubU=; b=OlcViykd/GHQf89lcwqoSIeGC2HEQjqBoylan7KLFsFZ/adUQp3yPJvQ9vzdiVsv3tVpuI QOCocqxMmCDcwajgNT7J0r/a0hN9daXvK0zzcZICVM4CkH/OppuvJ952qwd7IQy5VKn781 WZPrr74+ukoRMrHmVbWXP1MHjf2CuPE= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Sf+IENLZ; spf=pass (imf20.hostedemail.com: domain of ebiggers@kernel.org designates 145.40.68.75 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=1675313037; a=rsa-sha256; cv=none; b=AHPg8s8C0IMQD4w0+B14dqT/MfxSiNMTsvS/LHd+v9Xp6EZR4oo64hUgb6hnL/Qfa0UC2F 6kiTDIXTuztDp5t0ViDEippPZaf4sO7cW62DLVqKWuqjCRQRwGVxyltwzZdUCxyshewlSv xU5woXXGejkZDJ6C+RB6xkBaFmZ7+Kg= 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 ams.source.kernel.org (Postfix) with ESMTPS id B1ACDB82425; Thu, 2 Feb 2023 04:43:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59556C433A1; Thu, 2 Feb 2023 04:43:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675313034; bh=jOyM8do6FoMsZTh5VR6sMe/vJTgtvIwc5MLZQPrW/p0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sf+IENLZWlu+ktyVwbHxv6G6WPgYHWFc6RRcQ5ZtM/XF/5bHcwbVbUwm3Lw0y2yj0 rKqANe5mqg3TcIzHncMizi+L1DYM1MhSxoagQ7c/APsqpMNAfLjvlXB2xhHNAYbZfy XHljdWt63gJbeX5N6Sr3GWrjthRwyQm0yOcKomU7T48m3SbW/mc9SuATRYlgjn2vRn NfAK7U52JCS/nPToqXAfxRozUYuXwSweJzAvq41fgNO2CHegyoVe8VTuCU8EEiUPcV NixH7tz2mB7KHXUxFEb9CAl65jKt7wTGjWG2LrSsvkVqLPqbSFT5V531IOppOOKqnW /dGporr7i8Y3Q== 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 5.4 13/17] panic: Consolidate open-coded panic_on_warn checks Date: Wed, 1 Feb 2023 20:42:51 -0800 Message-Id: <20230202044255.128815-14-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230202044255.128815-1-ebiggers@kernel.org> References: <20230202044255.128815-1-ebiggers@kernel.org> MIME-Version: 1.0 X-Stat-Signature: erq9mif6me8u6gyfgthju9wu4et7ycog X-Rspam-User: X-Rspamd-Queue-Id: 669091C0006 X-Rspamd-Server: rspam06 X-HE-Tag: 1675313037-444075 X-HE-Meta: U2FsdGVkX184i6s/ZjFBT1gWc1SkZYfDE4tYb+ZlGCXWrsghZ/Ran046gYvdJcDHKmVTvPAS5z11R8/KAcVn6FrsJr7+j2fZ/RjPLuSaMaO2ijNF4+CRSeYuIDNwLeno0ixswVenudReLcyfpcu1bocxJnRxMKZtbf77oTF9Kjn5k1OjeEC1rgzAmeSGxLrblxTGt6VzjLXnvAHGsWiMLtGQturP3+co1OvowANzwF02qMSXki1z61zMZmeMXWWM0LmsreK0q7aXVUWA9PeoTxIXq2FXQIEzMiqbTjrs3c6wdULJluW43Q+9sr+AnP1rr172qfUOQxDgUSDGLnr6zcEyzfiWIXN+tnPX8CtYrMDXgBqffBxPnuKXINMrgVNrdByTaHX5k5WUstuBK85KaxGzPSYqitzsj+0FaODApMmO3GPFv91/uqXKXTrpHfOn3eqZLweQhUjNkysru+1HhT2Kf7qP64qRiDja8v9srK+gLoom8lYGvso2Mk5qCsF6C55QZrBJxazBSxdtLmDVIOThGqlZy/K9v463ih7o9bWHpNo4RkDhpAglpSkUDQ6ZdnmR06bBfYFR2e+ulfsGU5l6QAE/yYQ4xHZ2X19UeSnqrH1lCeKxrNtxvg4LHRW9flspwn51KAGXLCXsQsxHLv09z3WcQHot58xdHf+grvuPnnjLkDK4J/TeE8R07MZP01uliOtXm6Cijh/lF1YIrTP0+gk6e81hrcNW3psc8NTanixilBkkTGAhaN14uXjQbcJLl/3NEXGIdxuPwCQfJdK8fQPBJxvBmb3EUKUCfzje6bBiE+SzUVGTF/iXbuOH+TRKQMUeZxNO1OWI9jDHqeVMOJcZFQEO5GbY7gzF7nqyskdey/yFpejMruda8GEfGpiRq8n1AEIQHowSzPqI8PJ9HkqI8tbBkVseE6bwDY1tYLDMXy48+kYJrG89toECspO+iwt+PWPgtmaluDK EylEY8wM w/29DBLaeHMgiiH/eEjTiB72F13hEBEYeuPj04LOaf10C2nEu7ZbUNuePQ2hn0yv9lLOc4MBZvJI4zqpAAZeBiHw3wG/1MOWdg5wLn59yoi9Lym/AGi2gm/YM+jqmzhIBA7I9pXwJdpq16bk6+xVsH9o62Y5wYhyQ3BCJWlkvW+SQJpag0PprEO+a8m80YxEBmWvCgr/V5krtkG7fJBsXx+jB4KVbtfoNDvCjbQDTSp3sB+vulihG9kdgYUmjMqPzZMQaXc/uynBhaNW/VAb//VUR5EZtvJMY+BAicSnZxxgp67xxKjiPfk/Ucy19HzhDsvbkm59KCrkxcQFwBJdjxhbVAiYe/y4SJNbmkGQ/GB7a6G4gXhIseD0s/u8TJtaDl4t7n06ddxk+SO1AWS2rlFV/D3Bc69ebujP/lSzZfwz0ceawDS0SVl5iRJTAN1+kDnc+eu5mnE/ZXzYmXe4ZXiRLHAe57ECp/9BtHWJw+6id7u/H8zKMaR8Fg5XPwx3kL8cduqqIkJl2ZlcUuGaHVssW9a79agztUuUxJaoDqT2ZQpp2fCK3WCmsS7BG8l3iWH+wm9L/GcVdlSocXOsYjjllkS9jICYp1pqbwvPHi95X4M72XcrG51J/dBJlGWs6k/xg+jvUi8s7Dd901fpY2D8K7uLr/Se8JQDS/MCzyh6apcQ6a5gAE/Q7q/vpNU+JqdPSM9NOCG0d2IhLBeNsKCSoRoKENbH0UFo8ftcAlfGIl2G7MQvzlmgBpZ42vN8cTiI+Rq/4xUwNgw+HTmT3A1Iy6/m5SO9N3ZfmkZ/L8gvjdRN2/PCvP4gPvUbxnYMn/HyF9z/JGgsXi0y/FTkEO1hUq6UrPbga6QlnyU7oMcmVM0bCmqM/7QWLb+BXQStStWVTnVCxiypkNma+kc3IY8r7804o5hBk5nzzdQ1FprISlN8Y0GeQnphRp5/JnPYMd0AeQX8sKMrPZp/1W3xAOcADw+sz mxM0TwrT Kh6V4snN7HSJLmZ7OP7JnCnYLBf//qXmQXKXbWzcJ0BsVLhbrLn85eTwPQp1akpJfL0H9Cu2+grJRE+kld+ThCuQznpvfG0K1LtYQGXWgmws7QyECI/wrgNpqED7xdEPZtSRLuM/hH03UtR1r64dJQUsRKCU9LCRG88hGl8/FQvBwbIh6+gxEw== 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 | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 77c86a2236daf..1fdb251947ed4 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -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); diff --git a/kernel/panic.c b/kernel/panic.c index 5e2b764ff5d54..7e4900eb25ac1 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -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(); diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 06b686ef36e68..8ab239fd1c8d3 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -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); diff --git a/mm/kasan/report.c b/mm/kasan/report.c index a05ff1922d499..4d87df96acc1e 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -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(); }