From patchwork Thu Feb 2 05:44:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 13125341 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 4DDD3C05027 for ; Thu, 2 Feb 2023 05:45:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6FE5B6B0071; Thu, 2 Feb 2023 00:45:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6AE1C6B0072; Thu, 2 Feb 2023 00:45:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 576DE6B0073; Thu, 2 Feb 2023 00:45:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 4951A6B0071 for ; Thu, 2 Feb 2023 00:45:32 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 1F4A580283 for ; Thu, 2 Feb 2023 05:45:32 +0000 (UTC) X-FDA: 80421264504.03.648BCC5 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf04.hostedemail.com (Postfix) with ESMTP id 53C3340019 for ; Thu, 2 Feb 2023 05:45:29 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=I2OnUMEd; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of ebiggers@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=ebiggers@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675316729; 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=7dTV6hb04ErBeR13uLAuTY/ASGpEdnG4CPpgP5eCoOY=; b=0u25ZKeuqN4CbCdR6qJpq/miBVnHu8wWRLpJfu/mjxPvSgYETJiDXffIo+rqHDaZrHKwZ2 UBb3jE5xpxzLFFJW8sE488/eKWv3qvrsnhWrCz41rGnj7v9yQdIBXzJ7132/jEZV/DKvbH f3/+S2TOyeLuuD3Z9zuwFvQ2M6+MH2Y= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=I2OnUMEd; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of ebiggers@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=ebiggers@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675316729; a=rsa-sha256; cv=none; b=zOncmbJsHgRTLuVzbpZThKetjkQCOd5s4XpzCaS3/rfssdPMpXaYAbVc3Ha8cu44hlNKmS H4/qAIfVKNVfuW79p0PqQ7YBcGyTpoziKC0E5L8BFIGb2Ne/PPXaz3dMLXvfFhmlaVF9N/ HHrXpRA4X8DmpxbGQNW44SriKZ4zZD4= 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 49BF06188D; Thu, 2 Feb 2023 05:45:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A535AC433A0; Thu, 2 Feb 2023 05:45:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675316727; bh=nycxOJDoQHR+udRNP1byUzzeXV+porSobyOm4mVZRs8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I2OnUMEdnaOUS/ra4zbq5GGVbVRb+XyCB1fJ7hk4rhzLwEHpAvcoAti960Bk6hpyh dAWXH/y2pj8LmIk6XBYfaGbKV1a2pHezCZ9970VlqPeNCUSLsRrfxBOe9khPcACSht ZgNXdXPLbN4W4uA5z1j202B7N+pnXSKDOkUDS6La9De9xN0HcEWazKEIq2+6Im6Nhm O12AlE98IL/raRJfl7l7AUBcKMfF5L5tc8oeQnQsCQX36Ae4aQyiJTl3Qe5A0pjKkc 84zpehdc1TQ/pKfDd0W+8rocxF7TLliQZMcQT32yJ6jtm+9f2ZUC7fpjMLEYrdwuBU XRfQS54t69TfA== 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.14 12/16] panic: Consolidate open-coded panic_on_warn checks Date: Wed, 1 Feb 2023 21:44:02 -0800 Message-Id: <20230202054406.221721-13-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230202054406.221721-1-ebiggers@kernel.org> References: <20230202054406.221721-1-ebiggers@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 53C3340019 X-Stat-Signature: 4r8x64j5pea7s4y8qtdkm7owgzcm8smf X-HE-Tag: 1675316729-753922 X-HE-Meta: U2FsdGVkX1/kHEduRh7GpaDe3sKhI/3tR8Nq3+pc/Cg4pJcx9wJei0GKvB5RbFl794J+FOMg8zfzYYRRByYmlGkxyonRcrP/OBCBPICDia4zRekmutty6hvKETksTrwfLgV6z2OYsRsNPJ3YW1cjuFM9ONG2j4H0FG3EHKddROhD00/NKpkiyUVKKW81rDbdWbPQjalV1A5IrYynNWK7TCePNZTofj7tcpv/woncuBNDB1ynaL//9oZ1baSn4tDIFXK00DpIc6SXZqmgyKkPiGa3SILdnTUd+uraN/0pM2goPulSN2DtdvuuLdgnic6WIdwoxEX4e2kmYt7BXZXrX2TwlFzcvCTBQoet528OmF3ZtRJLGS+64CjuXdQ2+8ijgJKHJEYeZ9r3/cMcZ36Zb0zE+XL6nd8AQoO3TeuFdwkfLfR3t+Zm1JVmjkZRJ4WFZxKp6u/uRIKQeZWWyVO/SAvwMv+1cY0mGw6ERGO/yEQse619BpSlFtuhZ2nqrG5pXm8sPm//C/QyQEagY4wWQKCwqZbKVVqWj0XhZZSdL4j/P/1f1JP7NN0oU68kfXbrr9Cm9Ijkg1xDG5/xwyAVOtFpxQK9F6hN4vepe9tpzURxfwnX7ib7Qgh3cNnJ36n+Kn8rw3F8f8NHqQl9M2iRxT7HAxLJcldiPl9Nya5jR9EPjcLJy2ZTo5om9lAxNbR4HmmrWjtfUQvruxvVMeDd4rD6UfHa3Q9lfox7j3CP0VzIxXhMZ7Gb+J0IpQ+j4cOuAZE89QDWbc5XCYhBSLUbWfSRQfNN37aO2+iWJKWmGVDxNOZO2YlKGo0uhdyPbPCx3ReDFFEoRLkB0fycIVgliz9jcN13sv8tnOGPpwgedniD58n3Hu/bwvR32FlBTrt6RGtdM+wfvkE9AWwqWPErv5NOIpOXVJcCMYfWG9d33xivZwxtz11c98rm0JKq8v9xgKKwVbA/aMjWunbLjHw 9OoSXYJq CDOmQzD9/mC8QZ+ksfZTIesp05umH1JRXHsV/BUQ9NL6ji10GeCc2urInAu5OMSb5aFz+wuZLCUx1CGinQ113H9lercmtgSOAPxpX2oSc1RTIScvjyItiAVxRnjAnRfTKeOdzFgVEWyqoibqQIx7/6FLyOgguw5ZQuALiomBEa/ZK55k5RZ+jdA8wKBdUk8tjvXWLvhD6/FlOVLLkGofuQnIm/f7EuENiM2BdewdA7zP8kkYquyj4g+mEFXd0lr2ZaAYa3VUjHxuRDyFU2Z3iVR7rjGl0RfZH856fDBrmvcxqeZxmKYl0cJNuH8Rpiw7u0XrJCcAE1y0duqB8/ZWJnrVMw7s867ePKQw3Q8AVZ+40vJIXiRReXxbQovo9ijZU7W3cvWJjO88biN79YKzfE3ewHeMhGAD5zQvEBjqjGg1oiQEBB1gGAKIKNIUa5KRtsBcc3XZGVXeHWO8OkDAQAKHg44ldwuEke4tJypMR0W8/70d+apWYIUYn6U8ITol5OZ+rZLzqeLIiIHg9TRyb3QMc4J7az+5u3rrfu9BYubUNDoO8ee4LqVegtNtaPfgm3P4vIT5bXuIGOf0OZJbka5nKWHEJigxY2PpvBVSS87IHKN+FafSmr3E5fs2nGsJyI1appOV5GDpCdu9ivFYzNnhjjQYtSakDd2JF58X1nYmJ7HmTUQ/xAxu+AOTQqQVdH10Kc+7X/otHx9r45hv/dl0XkhlAkTlWfy4wNG4oCmZtsJxQd/M6gjLrzcz40VeODazw1uM/KXsCv5yHLKV7k6oSOwzwJStpB6+LnsFoIqXmHADbHZAi/S/FAQzaYOza9HEKM1nlgxZBRCncOvS4vzJvlVeh4BEWwGhO56Bjk/y54W72hWhgjngygIfDcIHnapPAeHIbk0D/0UkK+ZzlDb+7QhP491FH3sa/Zg/x+yh/6DX2WyPaaNPEupLrquhsBKv7g3FaAYwPVPheMa8DJ/e3n5sg LwPrHAcN UoxG/PKvI0uAaZTLHpJZ5E++alzPqkJaCQHyJDbkVoamP/cEAQ3ogwpw1Vfpnl4J6HFPb0sjbXFPxUUhjoeutW1VUB5r9y/T8JRSYVhTbZ+hOixyWQai0GfV0nkBAWVj2U8qQ4obFL3sCKkzOm5PQL23PMi3RtWTbo7JST7Ja3PFIaj6tbbM2w== 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 22b9146655958..a4ac278d02d0a 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -293,6 +293,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 bd7c3ea3bf1e6..8e3460e985904 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -122,6 +122,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 @@ -546,8 +552,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 544a1cb66d90d..5dc66377864a9 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3185,8 +3185,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 5b421f8433488..4dc577d7e7494 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -172,8 +172,8 @@ 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 && !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(); }