From patchwork Fri Feb 3 00:33:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 13126851 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 025E8C61DA4 for ; Fri, 3 Feb 2023 00:35:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 775886B0071; Thu, 2 Feb 2023 19:35:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 725356B0073; Thu, 2 Feb 2023 19:35:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5ECD96B0074; Thu, 2 Feb 2023 19:35:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 5056A6B0071 for ; Thu, 2 Feb 2023 19:35:33 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 12FDB1C62AC for ; Fri, 3 Feb 2023 00:35:33 +0000 (UTC) X-FDA: 80424112146.19.BB31A4A Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf04.hostedemail.com (Postfix) with ESMTP id 47BE04000C for ; Fri, 3 Feb 2023 00:35:31 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KKN3O7Mr; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of ebiggers@kernel.org designates 145.40.68.75 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=1675384531; 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=TkJOR9gE/ZgCf1np52kiVzP8tod51X8d+0G4m7OAISk=; b=5KjRoLPsBBLFPepIWFtHG7ynsA9pae/gNoc5HUymwCKDFXOBevs/4NVw+9S0cOlPCGH9fj SxQMNsMlIJKO54SLRjdX6WZm0IPqTUFixeDMHfZKnP8SDMdzvXCYiYHht0GQdUYY5mwMLF YZGQ5JEjaRbgD5jPdIwoF8cPe8tE/8s= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KKN3O7Mr; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of ebiggers@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=ebiggers@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675384531; a=rsa-sha256; cv=none; b=knNgcnzYPBx1YH9kXc01gBSptaFZc3a0XBwzCbjIHB9+RpFG5YwA/nMANd5GDrv4JTWFaW 16sXE8wgGYvjrODlO90lpL9m8RyTTCD1RjgFL/1y0raAoOPkDSJeUYfguwAcUYodCnpCvW UTLdRbqsigNMizDy0zXnBTm5DM3+fYM= 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 DAFE0B828E3; Fri, 3 Feb 2023 00:35:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F7BFC433A0; Fri, 3 Feb 2023 00:35:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675384528; bh=5qk9VBUgOtMc5zgeGwRMJtJqYseJs6r6q9ybZnMLMDQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KKN3O7Mrzj+qk2v763QF+gmzaZkZmbF6cSIko6XDBqxC8fWh7les+o7IBY48dfWMN XYgiDC/qnhthlvf6sjD8DnmvRUcRuBMDdvoskPKzj6jQgC4XsjWyPr+3LqoUkMp1Or AXg2/vACugQXShfCjgARl9raO804XVMJozlRS0BQd6ET5rNGa+GdB5V2mTiVPE8eIJ Faq6Ps+fTK3lfuF21roQKWljmlSDLaUC68xr4k++/QiQczu1NjcMlF8HpwuYcFWqwR r5L7kXRXxMvprspGShryVqLghUneGeHg/oyvB42QnF2nHTpXbBvrCWLVDPClxD/Vo5 8ZTHPedsffzcA== 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 v2 11/15] panic: Consolidate open-coded panic_on_warn checks Date: Thu, 2 Feb 2023 16:33:50 -0800 Message-Id: <20230203003354.85691-12-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230203003354.85691-1-ebiggers@kernel.org> References: <20230203003354.85691-1-ebiggers@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 47BE04000C X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: sunm3yrn83whsy6g5wfw8e81du8s44qa X-HE-Tag: 1675384531-141994 X-HE-Meta: U2FsdGVkX1/0At82xxdUUiXdSJiT4aCGc5PH5UG5VkaNoA2+/jDHpH+/RiUrfn66A0Rk53rS8WCBsA3Gm0hPHd5uKhZbDV05db7l2RytOMWiSzNdHTcuqJd9v7I5lNDxnEnrJ9m/BtxmDDkmcFBvWu/2Ch3UuhZJT1Rud5tq4SQn/6QQMs71Hz2Af0gJQI6C3i4K/+YW4SZEPxxCMyJN+qGZXRVsRHNwEauTzj9vufipp0Vv6pB/WitSivN9n/mEjCPfC1v/5hIMB3lQ9JHI+5EmTo4UyaLM3LHfhRQZadaaULiNci5Kcw3PsKUJfCHL5QLgtbcG0QxXBGTriBeAZVI/hiHIeZ9jstlBN5y1puQlCyLCx86lYOKkaiM3o8ZTDvOpovM+kblO3qHf2rtbDThbSkLt2ZfZwuCUFA3ARLDXgnce4xxY85J/Z0HDDdWL01Ev7RFVyRPD2uPG9jOCvjCbbH4bIW/D15QeonS3el7yx3gSzqhCF0/FbH63x7WAk+Ujlzjl846VSfOCSkntDbZOpLts7DK1ARnsovlBWW+7AX3TJ/WFF5IiFGGGPianapHq+U3WM/0xLwxXZzsfYZYn5qhkxWZPZkfigptl/XeMoZ9hb2SWSTGamVC1UlJPRRzOza1zFHTegG2DBtXbLL8oG9aGhLMdyOA7QwAoGGTd2ihWc/7zTn9enxNFwa/17iN1qGeRrFRAyhd3j7zXzMfKyPz041SL1o9IZtdXrmdLhhVe+iDOcnYJq9ilAPcXyKcRqUZe1zhLzuKd+JfeLMIrP9G89Ka+SI6CbFXCA3/DtdNyI6D/Vyny9q0Vb87hyVGyfc6KoJinotBzvsuM8dN3v77aoswXt1azmJNI8+yzNmC65YKHvWFAC3wluo6qCq7fCEXgzSjiueNO2FAcPpOYlPehT2ThT3t9nByey0BOSCEDGCTZrJi1IK9lv0Imw3qITm6mtz59c3rzYcH aZxD2ELV wBvY4dIkTiGjhq8VcPupgly1baMJWgeBZWoB4EDnPIJViSWn0Ia6vGid79NhOQMSaZ+eNnFxwoTL9K7ZchKxbahfa7b6Kz7Xcf4nFolO2e8B2sn/zv6Mh7dBa7KmVuXRkar/RZkGf5ZItzgdzs6XpmaKrKf2GCca0bOiZaOzo57nwgOG9vlur65ODF3WRu3Q7k6Ewh2vmf2yN4EWfzpHzeWVCy3TC5um81wxgnYbgeH0OWh8hppfyhxzVzxtXB0Y2VVaX8w+auHWYLUqeKcTM0rJV/nH9QYtsooGXMF9ePcy5nP8SAXo/GbsaPRY6Hi3n+DXo229wgubZIcUUho0R6YwNcQ4aYbSgVOiqBtnCZ9wjKFKKHwXlMQL9HIOLUNJR0po9WCgTd9i2gfCmw4yDYbAN78GdoSVHniBgVYCG/HXLENxZEGveG/5mn7X7wn6Qrt4qFHT61o0eHFQNOhPZ1fqYO0sGMTVfE/567mqWBH9TyIbuq+23uMdQ1TmNgwx0inNYUtfQF5psD36oWwpbNis36nDZhuPO9On3d/MhIF0Ede8EGApUrsqnIuzxB99T2VNesyu2aFE+yu2zrUzC8b0sAHfjiTRfzNiBCpdsl3dyihUpOd+iPKTaOmKxFZ4OfpLwjeZwZ3PSgzs+ZQTGlfBBSSVfsrPqpK7LsOdD820mZd4hUtg0FY7RhDPj50K7kpEqCL8xtGy6xMBZ3Bpq3Z0SLKrRLdzKoGuhml8rTaBk9f8o0kV1NlatO/UDX3Z3KWQ+1J5IstyFJ0wTm1Dz4uGT65P2Ioty+SEXbp7BNW+6arGjrA8IVshNu52faIRm4R7o0Zd795VRfHSMpPxghNe8I4lgJqxwEv4o4LgqSvdmRausNdofry0QHVzodVpSkXDrlgklVsIgLONQUT6maDSwkGS4MD1eV1J9moHd6fkLbPARRRolt7+NfZPC6EseFd1sywijg5awOIgppml9Pzv8jAgb 019Tu2+z lKQHyqXl8A7/JhgapGpWh4BFnCwOwmEsArpRJJ8g2UdZ9mMKGuSge3qGxXGkRWCqVRfKAD9Byh/rQEZGuEg6tVWZi4bGVwFaXeAnSeSkclmb+TDFxzDt84xRpWpMh8gjSFt4Mgl7rPT7vGwRj07CRkqTK1as7HY6LUIbxnzqTaxhrlrm9d+eRZgYx5ODGsIbrkyn55UgKWmsSfB//g/OD0ZFAPCDjuCMXjlVd4qYisIpKieZLlIaS6qGtXy6mVwqDoy1ar8faoz31qeO59vAXIaLBjEjQbMtbvkdExbtbyXcui4hf2/Ax5CT4o2q53WlKtHH7taGQLG0uQ3dLhIm/DKjCCpl8aGq 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 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 6bcfb01ba0386..1c96c83f97751 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -172,8 +172,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(); }