From patchwork Thu Feb 2 05:25:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 51699 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp52642wrn; Wed, 1 Feb 2023 21:30:05 -0800 (PST) X-Google-Smtp-Source: AK7set/HaQyWj240MJXJCKS3BswuJHLOVfg6q9p3oJo8KEd0BMb0kZuTEeQanGFoIHaMLgpyQydv X-Received: by 2002:a17:903:18b:b0:198:b3df:c753 with SMTP id z11-20020a170903018b00b00198b3dfc753mr4913263plg.45.1675315805333; Wed, 01 Feb 2023 21:30:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675315805; cv=none; d=google.com; s=arc-20160816; b=Fv8eKHz7TB20RgJ3j/cPAFPqvL6fCZlHkC/DKi1AGOmLZgQmzjkDq9Hplv0NUxnhQN kR7cLtNhgmyiHX8LPke6BcAHeHSdvlKdoSMlFkRQ6YgFljWmjWaQl8AtoCWktIQzFvg4 2FUWBYXquC9T458eg1pkZcl9DrwbuYdwY61S428BTMYS7UB7ibx/48+TAI921o1JxBej l0CksjrFsP7s+ODRCv+6JQNqDv51gXOxpklR3jaePoiGYEqSm44kclnLMWi541zQ/5+Y V4Xw95eOaG50ZUWtJ7KUXFP1hTHUXMtPvfczByKaPiVHRAmkrKeeyXVQQDb+l46djv/t 4JWg== 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=FDvFLkFM7eKqAsAAnTAZPELfzYmV6p/rezuo0e2X/oU=; b=JFBdeWjPegAWHQ5ktFXL+7/OqxMYAjpL4KALNCa7DIo8z4XQxDjtTDV1VnjwsYmWQu zHol1hB0q7kEfnAICa94xUpKQ5/fpmHgD9zA0nwT7er2SX4FgQ0p9c8Xy0BHqz7zuXD/ oy3tdJkjuU1sfTOZjqUh2UMXaZ1ZmGvM9H2jWHhSJR8iz7ch0Hvnzo0NsWvgyXyrkWxn bxAivuOqQArdbM/wY+4vJhug+wrG3iAdp9SIjeXWd/Gu+M8xVleUMO7orOy0kUSeY4NO jEZLAuMYU655stj/DBjV2d6SMhdg1MgEvfe0nmSmwmkfFsANDeDl8ZD4R8alyKq5CUSR BOLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MJTRJ6Iy; 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 q17-20020a17090311d100b0019484efdff8si24888685plh.483.2023.02.01.21.29.42; Wed, 01 Feb 2023 21:30:05 -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=MJTRJ6Iy; 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 S231996AbjBBF2b (ORCPT + 99 others); Thu, 2 Feb 2023 00:28:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230046AbjBBF2L (ORCPT ); Thu, 2 Feb 2023 00:28:11 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBDD014E9A; Wed, 1 Feb 2023 21:28:06 -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 ams.source.kernel.org (Postfix) with ESMTPS id A8052B824B4; Thu, 2 Feb 2023 05:28:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 992F2C433EF; Thu, 2 Feb 2023 05:28:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675315683; bh=fdhiGzoneKEwa2llZBhl60Z7qg58b1f/mZA06RgXQb4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MJTRJ6Iye1+rASmz7WEQpD9Mtnb9tTfYNgHKg8HEzp85eWtQTP4cwjB29dmwfQaV2 EsIviZvfTDdjlURyza8Z1vM0U4CC/mpLNgEEbvm+7rbC2Ez5S+lcFEThq5zB9g4sdJ cGWwt91hoSoAfcidcrhBVkUoUwXagtICA/3dz7Hnofc6AOOr9Qs05YV/7K32Ih74NY vZT7qfigTHP6IZ6TJEtK3+2oih2Ue0UX6aHcqdXDladFy0ytL2hbZMyfY4gpTTc6pQ VsCmuLeouWF8b4spML9Q/N4m97jqXFypQNOe1ic2xgdG5Hq36Gp84ic7NcbeuSuV+E EJ7Meiv7JRqZw== 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, Andrey Ryabinin , Dmitry Vyukov , Ingo Molnar , Juri Lelli , Patricia Alfonso , Peter Zijlstra , Shuah Khan , Vincent Guittot , David Gow , Andrew Morton , Andrey Konovalov , Brendan Higgins , Linus Torvalds Subject: [PATCH 4.19 03/16] mm: kasan: do not panic if both panic_on_warn and kasan_multishot set Date: Wed, 1 Feb 2023 21:25:51 -0800 Message-Id: <20230202052604.179184-4-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230202052604.179184-1-ebiggers@kernel.org> References: <20230202052604.179184-1-ebiggers@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1756695946269732963?= X-GMAIL-MSGID: =?utf-8?q?1756695946269732963?= From: David Gow commit be4f1ae978ffe98cc95ec49ceb95386fb4474974 upstream. KASAN errors will currently trigger a panic when panic_on_warn is set. This renders kasan_multishot useless, as further KASAN errors won't be reported if the kernel has already paniced. By making kasan_multishot disable this behaviour for KASAN errors, we can still have the benefits of panic_on_warn for non-KASAN warnings, yet be able to use kasan_multishot. This is particularly important when running KASAN tests, which need to trigger multiple KASAN errors: previously these would panic the system if panic_on_warn was set, now they can run (and will panic the system should non-KASAN warnings show up). Signed-off-by: David Gow Signed-off-by: Andrew Morton Tested-by: Andrey Konovalov Reviewed-by: Andrey Konovalov Reviewed-by: Brendan Higgins Cc: Andrey Ryabinin Cc: Dmitry Vyukov Cc: Ingo Molnar Cc: Juri Lelli Cc: Patricia Alfonso Cc: Peter Zijlstra Cc: Shuah Khan Cc: Vincent Guittot Link: https://lkml.kernel.org/r/20200915035828.570483-6-davidgow@google.com Link: https://lkml.kernel.org/r/20200910070331.3358048-6-davidgow@google.com Signed-off-by: Linus Torvalds Signed-off-by: Eric Biggers --- mm/kasan/report.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 5c169aa688fde..90fdb261a5e2d 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -176,7 +176,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) + if (panic_on_warn && !test_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags)) panic("panic_on_warn set ...\n"); kasan_enable_current(); }