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 E90F0C61DA4 for ; Fri, 3 Feb 2023 07:49:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5C95D6B0072; Fri, 3 Feb 2023 02:49:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 551F46B0073; Fri, 3 Feb 2023 02:49:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3F2966B0074; Fri, 3 Feb 2023 02:49:59 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 291056B0072 for ; Fri, 3 Feb 2023 02:49:59 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E90701C6A04 for ; Fri, 3 Feb 2023 07:49:58 +0000 (UTC) X-FDA: 80425206876.08.AA0B9AC Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf06.hostedemail.com (Postfix) with ESMTP id 90AF218000C for ; Fri, 3 Feb 2023 07:49:55 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=fail ("body hash did not verify") header.d=linuxfoundation.org header.s=korg header.b=c0ou6YWY; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf06.hostedemail.com: domain of gregkh@linuxfoundation.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675410596; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:dkim-signature; bh=YFxT47ukXjy2qLSWPNnxCMHBpGZdd04GUfnKyZMVT3I=; b=Jn5dHIKiWghkjHkfpkBs+CvJP7wU30bNWVvm0E/QgATXSyLRM3k+p8OZTNZpb6eVaSdyzg nP+MsTKNcde/BZ8YnNbreGuTs2EBFIpYSTRngM3WCYDfc6Ml9eHkp5ziq2u4woPxhhHDZi N5YrrWMFKZbMJg2J7XvouZOItrMM564= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=fail ("body hash did not verify") header.d=linuxfoundation.org header.s=korg header.b=c0ou6YWY; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf06.hostedemail.com: domain of gregkh@linuxfoundation.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675410596; a=rsa-sha256; cv=none; b=WkRihE747K0pxXzhehpFd1k4RLP4yx1lx1vyPiiibko/wzcf8DxROo9W1BQNjZLcBrxsCy P50Ld7LwD2dNaPbTRRF9rKyE/WigRpzscPKZ00V2Ysajt3tYQbuXOcmxUNp2Gyi+zfzJYu w4uhhvUukRn68Iv1m3NKvFoftpz4qAs= 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 sin.source.kernel.org (Postfix) with ESMTPS id E4551CE2F1B; Fri, 3 Feb 2023 07:49:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A14B2C433D2; Fri, 3 Feb 2023 07:49:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1675410589; bh=O7sE2ZJfVR1Ua5+1Yq8FfX0opk0UMXcurkz/mwGsndM=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=c0ou6YWYdeDnwZ/oas0GuoPtSsuvS8I/kTrZIHvs8hit3d/7on/MhHXn1SoxAPVQc w+0j4lK7x+BJFxP6d9p8wRNad2aPQZ9SegXRdkxS6wb3K3/T7nDtGEm6SxZnbVPMgV ULcZKNeR0tIFWlDn0xLVAyvqAX3VkkKGHhdxcajo= Subject: Patch "panic: Consolidate open-coded panic_on_warn checks" has been added to the 4.19-stable tree To: akpm@linux-foundation.org,andreyknvl@gmail.com,bigeasy@linutronix.de,bristot@redhat.com,bsegall@google.com,davidgow@google.com,dietmar.eggemann@arm.com,dvyukov@google.com,ebiederm@xmission.com,ebiggers@google.com,ebiggers@kernel.org,elver@google.com,glider@google.com,gpiccoli@igalia.com,gregkh@linuxfoundation.org,harshit.m.mogalapalli@oracle.com,jannh@google.com,juri.lelli@redhat.com,kasan-dev@googlegroups.com,keescook@chromium.org,linux-mm@kvack.org,mcgrof@kernel.org,mgorman@suse.de,mingo@redhat.com,paulmck@kernel.org,peterz@infradead.org,pmladek@suse.com,rostedt@goodmis.org,ryabinin.a.a@gmail.com,sethjenkins@google.com,sj@kernel.org,skhan@linuxfoundation.org,tangmeng@uniontech.com,vincent.guittot@linaro.org,vincenzo.frascino@arm.com,vschneid@redhat.com,yangtiezhu@loongson.cn Cc: From: Date: Fri, 03 Feb 2023 08:49:15 +0100 In-Reply-To: <20230203002717.49198-12-ebiggers@kernel.org> Message-ID: <1675410555184174@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore X-Rspamd-Queue-Id: 90AF218000C X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: imgwqkpcthudrjhjooetsoxrqiapjkyo X-HE-Tag: 1675410595-265500 X-HE-Meta: U2FsdGVkX1+L1hUQULR/x4PxvXJ5zYpZNcDSqllmrQqoQXjn/OeOQ2bN+CdQwNsTbPs+0JOPn1+fM/vDkIN3BzIkrIiWsWF47ct4jmKM/CHgdElP6q4hogmTWRdpfsu+vtUP68oUgUl3E1++citYf7HskYPFy8qbcp41aLpcaToZ9iP8oGqwG5E+pclVCne6Dxka4NDKm+b3b8ePN49zozZNHk+o2vCnejXNcvdg3ergKPW12xeReFo1cchVGl3gk2XW5F5h+YsmsHDuaQNKYVL2AvrtInP90kSesWK2Xh7KCFhD4TqEU3l8XzyOR7eIFksN07wnk/+XMWjw76Gh3fPlQ6JrBv3otiNRMTHL+r0DEh+C/Pv8EjDRsT6aD04gM8eumN7ht2ZdrsX2VAfdhwEwg/wM8mvBBxbiVHhqWYzZvpz9O7xgypkTg9CFA+bLiNhy8AsMagmiaPg1jOprkKwpBK9MygtmcIBQKlaFKfgMTI2k1EpqaGaAuFq9tGbXXgaWFILdma2oNJASd42kk2XCAgEJWD65IH1IXoVS4VZjRYqAxGjfb3quG7mPnEsdpyWpf5a1ettSv5uVmOMdjCYvlh50mMpCbVBmCjrJC+Je2sZgOMzca+YNJIjG4A6MbAEC8eYHZbGBpF8aABz3IHN8DVi3zAT3zBVcBG3fybQlv5Ek95HA8Uom/Yq6SBSJgP117NxJTvu8TEJpC8Q6Yxp7EGqAW94wYCnV6GKk8IH+8hDIgnMAqDeF70IotPAjpCzTEAHCEHmR+3v3FYHiubhN07vC30bpzcv9KruKecgnccFt4uQ/onrmc2riKdf/rtiOFHKW5imW1l1OmstEmh1w17kLb6H9mJWyQPvGF33B34Dm88N/c1vv0aqxvW8I1DfHYBDIB4+ToMD7We5IDe1GRCVyulPqLkPbAyn+18DMUrFDgKIvh/ItSEDDUMaPfwe6MIciNdYUTgn3W9d 9KzTEvxR Fh8TEBKfVCSdo5bX8un2d66hla+EL8x8v6mYIUzpHzUJGfGlk3305vnni35pc4VcHt8ss5QQcSXzHhifbhlvp153ztGfNDoYe/AvZJdVJVdQ7cpBLklBqp1xWh0fVIU6rYRoF467wmeoYvLCgU+8ML3tD0cf6TSl9IlJASyuWMMAXKe9GhcXqf0i3SkuYJ1hotD2onsirjkE4GZ4SuPvW7bgm32UnYNHYVDoPBoWAR7xbo/o/U8YrtfLY9jJBrVsFJsEm49UbFdM9AuJWYnbuLpQkOw41inp/N7ObOiDHtGFVrb0JyJEEKr2wpnv+VUkKiRp7g9cUwyibPQ7ARN2LG03y30al8DVA6iO0mrTgIRzNiEgybQ0k4bOOEuJu2DB0wX1VY2fo3QEyMj/gdyVQ8Kpv32eVHs1ufCBdLFZOkn3399tKV5qILtskj5eD8LyX8wCLBFXIS2SLzB/7ecxbTFVn/afy4xCpe9Hw/eTP2E75J0CN2empiJT8k8QHYQm9elnnFquaNSsmnFuCut/G5ru4a9FZCFES3zgdYbih+LAlOEcxcm0bkOhHqTvMw80pfJ/FaQoBX7/l2sOPaPf2//DRSehJg0s/H6Gm/dU4/uXn6boNMyazSe/2MKRMofco4tLkPuec3CknbWn75pa4RtdMS+zn4b2SYRtTgFUkDTYsc3MgFJ9ShMcVliy6DYsimtZLmHn8HHsRjYtT4pFUCR+Ii8N0C+cq8hHVY7dmME+1TgYiOY/YTFcCL52QNIxCg9GE+IKLOv3Hxrn5V1KhG3UcM8ADCsx9hE7553Gc/evYdq2O/rfubv0mtM8dliwO69s/X0lXbv0VYnAsDozYLSt4cJBkMi7zstXCyu3tadYwbIjWAQN849eY1rIOBQBcKJYYoUnE/6uzWWHqoAVzPdIJ8JeRY3dPZCXQEUx+kTNs92sVHamFEnVg6sSlHQt6eOOLxEBJ5qY3e0hsqQyNpAVj51u5 lPmFN7zV HSq2OdlTMKh/Vi1ktZ0nRMePHKwwjiK/ZkZOPVEvbRyxgQOagbwEPrW9HfOK9uhUEoAC99BBleWw9PYYVXTouSdf+GeqI76uxZM+hsFbbrEmwLoft7NGpqoWW6rGSFBHaztizX93868MB5Zq3ooBmp7wvXj6saFBnvCr9EfFxSOJZfXlcvCxcH0E2kqaAxd/e7gArWGyv1cKUL1e3kRW4uEwnobySFpjNVg1TrV2fooWXIhMx91DCR7pjXKdWR4VP7phbJnJp/5mKLsRFGL4CXmyN3GFqakNNN63bgCxUKLy9CpFdExT3/O7ZTi3P4VhN81xVHVO6Z8zfdiYO1KyteXMeyWmzRWGbtO9Rwk8GgRgvXSZx/HoEK1qs7Zr/Vdh99QdMT73BsHPFnCFKxAYpD0I619cROVJKPQEqryU9iO759b9kF2+Uapgs4g0tgKiVdJJ0YWxKaWib7gpmPts9V4M4DR5KU2y 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: This is a note to let you know that I've just added the patch titled panic: Consolidate open-coded panic_on_warn checks to the 4.19-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: panic-consolidate-open-coded-panic_on_warn-checks.patch and it can be found in the queue-4.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From stable-owner@vger.kernel.org Fri Feb 3 01:29:00 2023 From: Eric Biggers Date: Thu, 2 Feb 2023 16:27:13 -0800 Subject: panic: Consolidate open-coded panic_on_warn checks 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 Message-ID: <20230203002717.49198-12-ebiggers@kernel.org> 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 Signed-off-by: Greg Kroah-Hartman --- 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(-) --- 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); --- a/kernel/panic.c +++ b/kernel/panic.c @@ -125,6 +125,12 @@ void nmi_panic(struct pt_regs *regs, con } 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, if (args) vprintk(args->fmt, args->args); - if (panic_on_warn) - panic("panic_on_warn set ...\n"); + check_panic_on_warn("kernel"); print_modules(); --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3316,8 +3316,7 @@ static noinline void __schedule_bug(stru 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); --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -176,8 +176,7 @@ static void kasan_end_report(unsigned lo 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(); } Patches currently in stable-queue which might be from stable-owner@vger.kernel.org are queue-4.19/panic-unset-panic_on_warn-inside-panic.patch queue-4.19/objtool-add-a-missing-comma-to-avoid-string-concatenation.patch queue-4.19/hexagon-fix-function-name-in-die.patch queue-4.19/exit-add-and-use-make_task_dead.patch queue-4.19/h8300-fix-build-errors-from-do_exit-to-make_task_dead-transition.patch queue-4.19/panic-consolidate-open-coded-panic_on_warn-checks.patch queue-4.19/exit-put-an-upper-limit-on-how-often-we-can-oops.patch queue-4.19/panic-introduce-warn_limit.patch queue-4.19/exit-allow-oops_limit-to-be-disabled.patch queue-4.19/ia64-make-ia64_mca_recovery-bool-instead-of-tristate.patch queue-4.19/exit-use-read_once-for-all-oops-warn-limit-reads.patch queue-4.19/exit-expose-oops_count-to-sysfs.patch queue-4.19/panic-expose-warn_count-to-sysfs.patch queue-4.19/docs-fix-path-paste-o-for-sys-kernel-warn_count.patch queue-4.19/sysctl-add-a-new-register_sysctl_init-interface.patch