From patchwork Fri Feb 3 00:27:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 52231 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp558618wrn; Thu, 2 Feb 2023 16:36:34 -0800 (PST) X-Google-Smtp-Source: AK7set9gTWx+vpRYsxRbSBoQMV6IIyDpLVaDCXHLxL8tgOlosQlHMeYfV0mRHArPeXEcpIfGNEfC X-Received: by 2002:a17:906:d7b6:b0:885:d02f:d4ad with SMTP id pk22-20020a170906d7b600b00885d02fd4admr8668627ejb.43.1675384594678; Thu, 02 Feb 2023 16:36:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675384594; cv=none; d=google.com; s=arc-20160816; b=bPGauZq90+7MFmZlYZtSQHzW69ZeuU5ssnu8eOdZO2q3T6RUqqSSyWzi+h5MFS4NZb ZoOI+8ti048KENpsdqaxAT/zrwSd/zwLkoc7X4PL7CRoVHcBAT/XP/IGIltJknL2UHAy Z0v2gBUXlghx4wfC5a4wFnQU+kTtLMDF7hAmgTH4a0p0+KBto5yKl7AWLcOCYrhfZsTj ex5TtjmU+igYs7Nx2vtsctf/eP1bkVGFKLmIuPAzo2hcKd8WWjMPAHnGu9AMCXQ2Sn78 gya4rB01MvaQzwLv5LLq8krrzkPYqzxVwAg8oFcTXlhrsHoDTaK80IVRHvxBBkI3+m6U n/gw== 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=fiN2tiAwu+sjyLf6X+YwRSX24/0QbAfJU7AjVKqo7lo4QQevu0q0lcYP05WZbUZ7vI sLXOUvTGhcuye1dW9h74o8Avd5cj+lv8SbU7oX02fz8hXlet9j7of10d+S/jsRU0bHgf 2AIwmSZnuvnVJG646My/RorZg+QrpTLKUAgv9ZV5VSRNxOQu4iiqxD7kuphGkjJk2pP6 umpo95496SrwB8jjP0BL0Pchb8lbHzmTAAbNpecGu0trDvuuvQYg2b6b0raSJGsvzrnX nVfAk6h2WX3/pxRF3COCUyzCdGv/yCpSIUwP+5OlF2G1Gqp9poKRS7+my6l2aYlfhPxF A0eA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EoexD3ui; 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 z14-20020a056402274e00b004a08f89336dsi1246849edd.446.2023.02.02.16.36.10; Thu, 02 Feb 2023 16:36:34 -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=EoexD3ui; 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 S233519AbjBCA3A (ORCPT + 99 others); Thu, 2 Feb 2023 19:29:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233160AbjBCA2Q (ORCPT ); Thu, 2 Feb 2023 19:28:16 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09D1287152; Thu, 2 Feb 2023 16:28:15 -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 B02F6B828D5; Fri, 3 Feb 2023 00:28:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D618CC4339B; Fri, 3 Feb 2023 00:28:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675384092; bh=lcs6AXLIFbqkFs6UrWf0Ln1qRWrFsNHR0PXy8tOjKNA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EoexD3uikQU6VS8X5XmuE7JQa6sW9w2w9FvcBydhX8AWkchHP5SZihx4nknkCiLeY cNW9DAdeq/XWdX+s3oWOzsgkBxJeSSjBdl548TFzxgERKQLAl0xyJ1wW/AXxud8ujX l32+duiXBFZzi4gCT0co2A7fySnkfIZFWIWHmc6DP0BAYigTlSEdtJpciHw8qZ5mYI 3d6MvNm0I3eRLnZnCvbf27kPGRoU/Eug3HKbGIfR2Y91v6ipM4YZ9kXiIlxDVQemWH wgJLCUcYZEc3k6A3eQVQWnA+AjMa60hDNTkYbP5g6QJbRv4HhhBHtuANffwf7fiJiq dJ85TOAoM/v3g== 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 v2 15/15] exit: Use READ_ONCE() for all oops/warn limit reads Date: Thu, 2 Feb 2023 16:27:17 -0800 Message-Id: <20230203002717.49198-16-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230203002717.49198-1-ebiggers@kernel.org> References: <20230203002717.49198-1-ebiggers@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1756768076491644852?= X-GMAIL-MSGID: =?utf-8?q?1756768076491644852?= 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); } /**