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 17E51C63797 for ; Fri, 3 Feb 2023 07:58:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 91F1C6B0072; Fri, 3 Feb 2023 02:58:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8A8476B0073; Fri, 3 Feb 2023 02:58:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 76F8E6B0074; Fri, 3 Feb 2023 02:58:15 -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 5EA296B0072 for ; Fri, 3 Feb 2023 02:58:15 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3355A1C663B for ; Fri, 3 Feb 2023 07:58:15 +0000 (UTC) X-FDA: 80425227750.30.9004CCD Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf05.hostedemail.com (Postfix) with ESMTP id 5F5B8100010 for ; Fri, 3 Feb 2023 07:58:13 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=fail ("body hash did not verify") header.d=linuxfoundation.org header.s=korg header.b=Cm05RmJt; spf=pass (imf05.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675411093; 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=K5Uq4cn+bz52/cQoFVa4zeT/J9tBHQs6Ad75I8R2w/M=; b=j6LBguvfUdtPwHHOnYwW8O4fSHWTz+ZrgQibRilW/HzndjH3BDA1um9oByv9dCSwqGs+R8 3mAhwRSTNznSZmBW4Vz+BEiHM/pOb8RwoxjI8qeLtEc/lj2lRBOl0oGH3cba0zAYcMBvj+ X5BZ1Af/Q7tiwzQsBRSUP64mlyj50GA= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=fail ("body hash did not verify") header.d=linuxfoundation.org header.s=korg header.b=Cm05RmJt; spf=pass (imf05.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675411093; a=rsa-sha256; cv=none; b=gQZp8s1y8YfaEraG1UaS5EyRJEGdwvVWr/62dfZoM6QYvgSGR9/r2qYCWxZpcouD68uA8g 8ev/WYoXdiyEAe3uA+sqJAAxvPBxoY5IvRS+UQ66hg9o5bwhZsWhRZYBiaxuiTSQvTau4C vXlQe38MsknI2uD5L+j5C5YIhaLoBGQ= 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 1070E61E12; Fri, 3 Feb 2023 07:58:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF513C433D2; Fri, 3 Feb 2023 07:58:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1675411091; bh=ghuFDwW9wDAk3ZdFMTmSnhN3DDSVozUy5WkOy5XTczE=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=Cm05RmJtqYxR6Ncy4VGDjVGX83uH5a4S7DydVyfctqnJKvC4lW8apzIGgBhrn7JlC uXgQhdwRTDxL/BVnAPQzT9hUnF38wla8E7RdIk5whbZN0jt+jeFmPviC2dR8p655cL VsLtIOPDiPHGT6ZVE99Y08s3zltNnOzjSJIAALV8= Subject: Patch "panic: Consolidate open-coded panic_on_warn checks" has been added to the 4.14-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:57:36 +0100 In-Reply-To: <20230203003354.85691-12-ebiggers@kernel.org> Message-ID: <1675411056117153@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-Server: rspam07 X-Rspamd-Queue-Id: 5F5B8100010 X-Rspam-User: X-Stat-Signature: tjcwouxw6x5ts4ac7yekq9zpajdokuie X-HE-Tag: 1675411093-558388 X-HE-Meta: U2FsdGVkX1952g0iKzCXyVRpa1AsIKMzRj9rVp3Hwt/sGBgohMaDMIVUInJFelfputn0asDeJKyTP+Klek7i+vP/cSq9Tm/p6IqyhjPmMb9PUch+vsCgpXkcnTf/JKAQaucBrG3gP532J+yFbP6+ZalvhtbrnLkJY7a3x8ZS4AO+NKzjQFxaHvAB0XB/c8LYgV8owxBV9szafzWbmJRc7OVgNKeDu3+gcwmCwpGLNuxDVJian6LyC6F/7hsUIVcJaxE1P0mw1duH0Ux2idyqBzGYKKKmEpYEoyHLYIsz+QqAYoT0RpDW6CeUo/i92Jk/L0d34jZticiG6lrL+OSezsXXLQKpv+dcCWzRQ2riXogfWJpasfU4dXfo7AFEgZJhm3ncoW4eyJInUYmzu/Dd+AtEYjCYmtcUcU9/xMpWWunWZiQcQVI3brkx2H1qBDFs6v292eOlp6+CZIj7P1mcA1I8AI/h4LYLVxoCnKorPLnkbgCSlPYwv27KOZbyntZ99rZGAG1WpxChzkYSXVXqhAz0kJUMVbEKe5fnIeUvZcOO4XMkhCxRqPW4uJXxhC9V+xxGN9dwtLsvtuA+UrLtWaJ4VQn4puIwI3D7Do9tv+YzD/F6zQvxmxM9mYow3yW5f6TqKpOSCQIlCYWa5c/T15WsIhji9nXwXnpT75khgL1uS6DfPc9Bca7ojx+SIYSEouyYhkMgYW6OL1zqn21eDRRZnU23T3X8DB4YJzobdsywsnstMSneUxFMzC3MmxSDrMGZCRGndv56wEef4nntWOqUUoLz62Nwwaaa0GJfwgh0nckW2GSwTdDA9FzjNE8OWs0D+rYZ/TnICIc+lCR14A1DS0uOEcPFEX8LQDQnYuMRnLo/GZwtArhbtHQMHYCtGG3n9Ja6ABpqcbAi/Ej46xh+N+7anebSQoEnsLdKaHqvA+LqQYDWAMKQirQW+1sv6R1N5U0LLw7HSemNeiB fx2bkNVX FxRDybh2HoUlxB5uEDN0I6voDEninN43i+r9TbUESVHfqSbMR8GyjrXyFQ/ITdJ2ix04WUAimfL7JrMR7IC9TASE8+lnNkfZE/QwmDiX9Xg9GT86d9Ot2wf0BHOMzFMFL2rYY8u0SiOH0tFUCEf6apWAP6gB22SKXaXM1bHjeDyeEKULH+DYrjv6qfur6YZZo/xvSu65aURV/ii4XsifP58LPhomW/wskPsEYtCn4CsqQH9oaxu+tx987dQ2LZYZCzXM6QCi6W9FmA1krlXtlvZ5PEU/0MjJeaY9duIGi9o9axULCEDUVcY4eVCSBovjEA49NYaF1TzBwW8D2c+qJ0O2PdZi1T4ZcXybGL05araoHK/s2xqus/n5ibZ2YFqTNEzdedWKIv9pyrbmugdKkWddvtfp1lUG/gnUaQUqsUcHpMAFYA8ov91i7OERcfJ26kZrqHTaD5Lc6Nq/YqDOm9OrBCzE6g9RYTGcB6Bd4ZKc5Z/FCf1H0iE2pjA+0ap9VtfPS6hGClRKjgheb+D2xT+gKEc4NsCf/y0+bheV3d2tBjGZ+PXKtJzQSeqgOhrZEnIEg/tg3llwr3SnHaiMq/u0TiPxYQ8DjN98jITU3v0+3KpgvfXZmdrWyCHRSwfkFOl3RFGtGZ76Bey2jsZ6FZLEiE/PpXNuulW4BBNV1WjkyPrMLh1hFQKHo1RTzTAQCXu8ordTGi7g+iFc8sK10ir14bXF1aU2YJb4p24XxIfpg8EIjOR5Yl//QjnRDS8IGjzMnlSjDbGfiLHXBc8AsCzgLgIPnlSgijykGwNicLSECogTszfmOvthuCPOj9TWgWBrLjLbfoEzh8MocNb/WHmkNajmRA4ufvve2Zb/HdtaGMiKnUk60LKgpPvs5oTAl1AToBUghr2YXhqA/EMPIN5tdAPY7DZjoyCRalPlzHSkVsFMBYHQ9QT9i0or1Vs1+iMOmFH9Bjl7FrYTe5Au1EWnKuzUK OT105IEM crpL9U8F7shBvmhxe8FErCSJsoNNgK0SWM5+dDZ3kIfeUUYXAv9sImBnUhEdD67d6uDWs37Yd/PrfBKDozWaGuFeWQgyIVVwCwlFdZ41VfhdHTVm7U2mx4RH3pxVx/ytdWgUdP3RGE1o5qL7RdqazST8MKbjMkE4pkYeN54EUT7993bTAuCTT8spivh2onOfHoH1hVCGj2H4ZwS0/Q4vIDqyDUlkgEFZidvIGboFeCrFwDxS1hi2OPXnMRuZet1yNQODT9LwHwtY5avz95weke4/03uLU0hcSk5WdG8cF9Y3Xe6YI4NEPO3f6Z7zBwYQ9HXrRxI5hr7KMI5Qg1MYky4qVjg2pE6fctMQ11EOwjmFTFfZr621xPq1QVhihzEM 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.14-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.14 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:35:49 2023 From: Eric Biggers Date: Thu, 2 Feb 2023 16:33:50 -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: <20230203003354.85691-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 @@ -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); --- a/kernel/panic.c +++ b/kernel/panic.c @@ -122,6 +122,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 @@ -546,8 +552,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 @@ -3185,8 +3185,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 @@ -172,8 +172,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.14/panic-unset-panic_on_warn-inside-panic.patch queue-4.14/objtool-add-a-missing-comma-to-avoid-string-concatenation.patch queue-4.14/hexagon-fix-function-name-in-die.patch queue-4.14/exit-add-and-use-make_task_dead.patch queue-4.14/h8300-fix-build-errors-from-do_exit-to-make_task_dead-transition.patch queue-4.14/panic-consolidate-open-coded-panic_on_warn-checks.patch queue-4.14/exit-put-an-upper-limit-on-how-often-we-can-oops.patch queue-4.14/panic-introduce-warn_limit.patch queue-4.14/exit-allow-oops_limit-to-be-disabled.patch queue-4.14/ia64-make-ia64_mca_recovery-bool-instead-of-tristate.patch queue-4.14/exit-use-read_once-for-all-oops-warn-limit-reads.patch queue-4.14/exit-expose-oops_count-to-sysfs.patch queue-4.14/panic-expose-warn_count-to-sysfs.patch queue-4.14/docs-fix-path-paste-o-for-sys-kernel-warn_count.patch queue-4.14/sysctl-add-a-new-register_sysctl_init-interface.patch