From patchwork Thu Feb 2 05:26:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 51701 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp52694wrn; Wed, 1 Feb 2023 21:30:13 -0800 (PST) X-Google-Smtp-Source: AK7set80b32i7PPoRuH9Ul+8shEnb0a9+JdeIlGDz+llUWRPLwefOKsXpOj2oBpK0ux0ZOJEjunZ X-Received: by 2002:a17:902:d2ca:b0:198:68b1:6251 with SMTP id n10-20020a170902d2ca00b0019868b16251mr7614138plc.4.1675315813468; Wed, 01 Feb 2023 21:30:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675315813; cv=none; d=google.com; s=arc-20160816; b=B4VB7XlDB/Qqlvk/d1gjVgPm16i0o6XYw+dzJwVlQeuMcNX0xIuDdUPEV3JERxEIbN ur4hrD9m2y34B+L+QDb4JjLFPX+sUUbf6rdIdsUjQtwZOXQZHI/iaowRiPNgs99MJyNm XjFcZb49HI5VPqnwOoPuQ66TlHcRHZMUJ3ns2J9C3plWO3zb2T6N/sm3TVoVxdLxH7R2 +0b8xuRVZ5VSpIUg43HQjGh1zW4QlPOAwfP/708aWNGaEDUSWIIR4aNGSCfGOa/DdfIj 1DThcN8swsmb1X8gG1pRasDCnJPIasVYFdGwK+xBj38iPuzE/8UL2YTj66bVxtVUnGgo uOFg== 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=raj1TKjTjDopzSOlHF4NjFCu79RyIcAXg5P6JScheNY=; b=Fh8Ms7yhSYgtkbIBQiAmFTr+sEXPQ4U3H8P8HvDhRCs8OSeZ7UC9gJt1da+csEZapo p2hfYsEc0va5/SNv1wESt4omfASoC6QamRV19XXFungI3TKGfgUjDo9+LJyu+4j9F47w YmVrVUoL/97OQQNsR1fzragyuAEbGT19myEKIIgWTcptdZxU7AUfLUqmCZQ+E0RYcOVj 8hdD+D0pCVXnygvUj6TpV7a15wtWadLdkDGwBXqsZj2WPkTPBcB+BvZL4WIsLA9FsJQU Df0mY73rEEw7QWca2ss6kWLCLaNQDHuX4yqgKlLnWxz0gl1vECtnWRS2c1gN1ehSC3iZ VtRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=NjC6Herw; 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 h19-20020a170902f2d300b001926fcc7389si9078357plc.424.2023.02.01.21.30.01; Wed, 01 Feb 2023 21:30:13 -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=NjC6Herw; 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 S232161AbjBBF3V (ORCPT + 99 others); Thu, 2 Feb 2023 00:29:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231970AbjBBF20 (ORCPT ); Thu, 2 Feb 2023 00:28:26 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD39827998; Wed, 1 Feb 2023 21:28:11 -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 8EA94615EF; Thu, 2 Feb 2023 05:28:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A436C433A1; Thu, 2 Feb 2023 05:28:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675315691; bh=lcs6AXLIFbqkFs6UrWf0Ln1qRWrFsNHR0PXy8tOjKNA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NjC6HerwNYZpDQWHNMEAMOutZtfItpkk143ioeMYmoqxhu5m9RxsfveJYd/9divWh UH1XXeS0GcumS5+3MeUPWE8d7Db4xX1OT0WvLTfXkHMiX3BV92mW9H3upzxduZEEM1 5dmleyl/4f0zT0C2WUinAVirG4+tKVnfWDEVkR9CNKwPeeqY/48sDwPno66qEplyOU 4KcCTTJmup/jgGr6P2U3PXtWnKmL0crqJ+xDqn9KZ9Glogzq7NIUN0iEfSzqwqA9Ak VGBIFaqph4V6WR5JffrXP2Ii1HHVozu15LGGi659U/e+etSoGfvRccQP334dNzKPMf cfN/e1iF17j6g== 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, Arnd Bergmann , Petr Mladek , Andrew Morton , Luis Chamberlain , Marco Elver , tangmeng , Sebastian Andrzej Siewior , Tiezhu Yang , Peter Zijlstra Subject: [PATCH 4.19 16/16] exit: Use READ_ONCE() for all oops/warn limit reads Date: Wed, 1 Feb 2023 21:26:04 -0800 Message-Id: <20230202052604.179184-17-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?1756695954682326886?= X-GMAIL-MSGID: =?utf-8?q?1756695954682326886?= From: Kees Cook commit 7535b832c6399b5ebfc5b53af5c51dd915ee2538 upstream. Use a temporary variable to take full advantage of READ_ONCE() behavior. Without this, the report (and even the test) might be out of sync with the initial test. Reported-by: Peter Zijlstra Link: https://lore.kernel.org/lkml/Y5x7GXeluFmZ8E0E@hirez.programming.kicks-ass.net Fixes: 9fc9e278a5c0 ("panic: Introduce warn_limit") Fixes: d4ccd54d28d3 ("exit: Put an upper limit on how often we can oops") Cc: "Eric W. Biederman" Cc: Jann Horn Cc: Arnd Bergmann Cc: Petr Mladek Cc: Andrew Morton Cc: Luis Chamberlain Cc: Marco Elver Cc: tangmeng Cc: Sebastian Andrzej Siewior Cc: Tiezhu Yang Signed-off-by: Kees Cook Signed-off-by: Eric Biggers --- kernel/exit.c | 6 ++++-- kernel/panic.c | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/kernel/exit.c b/kernel/exit.c index b2f0aaf6bee78..02360ec3b1225 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -975,6 +975,7 @@ void __noreturn make_task_dead(int signr) * Take the task off the cpu after something catastrophic has * happened. */ + unsigned int limit; /* * Every time the system oopses, if the oops happens while a reference @@ -986,8 +987,9 @@ void __noreturn make_task_dead(int signr) * To make sure this can't happen, place an upper bound on how often the * kernel may oops without panic(). */ - if (atomic_inc_return(&oops_count) >= READ_ONCE(oops_limit) && oops_limit) - panic("Oopsed too often (kernel.oops_limit is %d)", oops_limit); + limit = READ_ONCE(oops_limit); + if (atomic_inc_return(&oops_count) >= limit && limit) + panic("Oopsed too often (kernel.oops_limit is %d)", limit); do_exit(signr); } diff --git a/kernel/panic.c b/kernel/panic.c index dbb6e27d33e10..982ecba286c08 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -168,12 +168,15 @@ EXPORT_SYMBOL(nmi_panic); void check_panic_on_warn(const char *origin) { + unsigned int limit; + if (panic_on_warn) panic("%s: panic_on_warn set ...\n", origin); - if (atomic_inc_return(&warn_count) >= READ_ONCE(warn_limit) && warn_limit) + limit = READ_ONCE(warn_limit); + if (atomic_inc_return(&warn_count) >= limit && limit) panic("%s: system warned too often (kernel.warn_limit is %d)", - origin, warn_limit); + origin, limit); } /**