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: 51718 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp57758wrn; Wed, 1 Feb 2023 21:46:47 -0800 (PST) X-Google-Smtp-Source: AK7set+WZzjIGihqO4YkZTlgMy1Sj1gmqSAKmsUabiYcsICAttfDL/RieStosYGuHHBvWSKsSJ9B X-Received: by 2002:a17:90b:3a89:b0:22b:ee45:15bc with SMTP id om9-20020a17090b3a8900b0022bee4515bcmr5240413pjb.6.1675316807471; Wed, 01 Feb 2023 21:46:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675316807; cv=none; d=google.com; s=arc-20160816; b=vcmrbsq5XNIe+p+cYCneBKm9WsOEetegpQsbl0zCV+TCCdp/0oS3BEBBqZbGndCXHG tH0iBeM7G+eP+A3R2oNDPnMbySYXfunzU1qD9BHfHk3EPHAURaGqU0BMDzE2hA60ndg/ 2zmP2j4D8lPwwBkO1IS5n/8NShGAy7KPRvvs1HxWCGFh/vZq+lA3JoTrvErb6nFluHhs 2xwUgGGMLd7lVti9oz+ag+tgK5KiyCSZfbOqAD2VnXiqALNVATPZtPTRapvp8I0uxCF9 Yldtupa9r1bkOaaDUsxUvWUeRvrhByoVLZllplEVq/jrlVJpjkGgVBinNGR9W1QaLqpw 6mhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7dTV6hb04ErBeR13uLAuTY/ASGpEdnG4CPpgP5eCoOY=; b=PL9kfvyjykp4f29n/qx//XGvA5VNdbwPSdHqFHbcZqW0yHwCTK7uq1RMMaCTm841VP w/bi7Q1waJhSj8vbndGFYAaoZvT7jWhjTCLbqLeF2YraYJri1ZVCONbgPRgybd2/Siyp S89jKXzeluzhVhwCJ175lYMVRE1SgQp5rpWTgkA28RALKcY0PiviAuoqdK4K79qdBr8i IP0UDmfoWVbDe+IrhYdw+IBIGjqI4ueYndZDeBchkqYK8M5ybynpHwJqQZk+Qck4zggn fbApoG82tfIgYPBLgCi+our7trlGyToSZOeX3uq1NXc9ovgk78gMjoHFtgKV1xUMSqok TP1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=I2OnUMEd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v3-20020a17090a960300b0022c19e2e734si3671680pjo.151.2023.02.01.21.46.35; Wed, 01 Feb 2023 21:46:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=I2OnUMEd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232053AbjBBFqK (ORCPT + 99 others); Thu, 2 Feb 2023 00:46:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231224AbjBBFpf (ORCPT ); Thu, 2 Feb 2023 00:45:35 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0BE13FF05; Wed, 1 Feb 2023 21:45:28 -0800 (PST) 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 470B061783; 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-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756696996492003655?= X-GMAIL-MSGID: =?utf-8?q?1756696996492003655?= 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(); }