From patchwork Thu Feb 2 04:42:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 51679 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp37749wrn; Wed, 1 Feb 2023 20:46:12 -0800 (PST) X-Google-Smtp-Source: AK7set+tDmBNiPahvRki1aVzEnmnzHVLqiuKL7/a9Jy8dgXXDu/+qAP1cLAhQsdzgTehu4ESizgH X-Received: by 2002:a05:6a20:4906:b0:b9:92c2:7ecd with SMTP id ft6-20020a056a20490600b000b992c27ecdmr4920602pzb.3.1675313171785; Wed, 01 Feb 2023 20:46:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675313171; cv=none; d=google.com; s=arc-20160816; b=V6RO/61+B0/CC/3xAVdlHPeFJ+hnm5pK6k727x5DMqJHoFCQV+kQGMdhBdCB0q4xxR hV8aFuCnYeXxNRua1uhcZhWBL46r9k0mGPMSl2bfHCP+GqKMoYpzLs3+QIFi39bx208I Zf68QwvxaWqF3upGRcXoAAl4iQEwtNnEPAoIrc6EG2qH58iGpyuWR49lmz6xRCoi5yKl QbWDvA0Y8Va9m7XFhiN7uYVAbgoSt7a9q1iXxE48HaVyxdvvsrL+ZK/9PNZtZym36/Ft bWQ7rUnza8usffzoDWALXzL1Ea6CLlpfHJYuQIiLSNkMX5dP80RvZWsvP7SFW4InWTNa 7bGw== 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=EqFhzaEvmxMDTtrcVLK87Pu9BK+togBhVb/ndudyqdg=; b=I4IjBOvLbhcYio4n3rt+tzB6mpM8eqv533JFBSSdfarwxPFzyRyvXCR4zwTgijNQEC 3OOffXCg9cwwV7l/23I08FSd2WiJ1PsMpvKvxHF64yRJ6frfz1r5oNH3KI7zGu9Ehanp zs6XgNJM+P/jcgvqPDEYONhy+dzd8zyGJ227ZIjoaTgRm1rRzT7w4PGSlI5hEEyU5gib bcjWtXhKmDlz4kUJml4g6z2a5fA3VksWg/1NUWWko+PsQM5lchxk9aEB9ybZfzQ/AC6F oO4PnIW4Fk4Ae8UI4rk1I1/hvN7kZueFkKyTAY30QXVXTjrTdeSoe1xG8M9d6FCTZL/4 iL4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Hh7LNfQt; 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 h20-20020a633854000000b00478831d07f9si6904633pgn.312.2023.02.01.20.45.57; Wed, 01 Feb 2023 20:46:11 -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=Hh7LNfQt; 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 S231886AbjBBEp2 (ORCPT + 99 others); Wed, 1 Feb 2023 23:45:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231607AbjBBEo3 (ORCPT ); Wed, 1 Feb 2023 23:44:29 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37EF07A4AD; Wed, 1 Feb 2023 20:43:56 -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 BD001619FD; Thu, 2 Feb 2023 04:43:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DAF4C433EF; Thu, 2 Feb 2023 04:43:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675313035; bh=1WDmjjuyVga+D7P6svQyR42n1613E6yY3wGob4buoKs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hh7LNfQtS1v6rtHYRpYUC3qn6UimYhh6+J8v3ehqsyrV6jTp1zLe1CZRA4KTlBwMm vNasGp+CpZtQVrxLwYlI6oc8ex/2J8VAGr5mLLsz8xkNYnRdn9NMJaAxB7lS0uKljL O1fDFhzrMPcIEq+zdZxNCNDrK6rFzJWmqpAuOgHJ0I/IX4MSgjoEPA6aU4rB/5men6 pneeqjdFPRAn7cu5heE4qO6eBlanpeKRnhV9mGW6WBfl04hblz8JfDHvya4nQKXbM2 ML2QuMzHJK2oA3xQQodBUHhDigB5YSfu34Rx2t1UJ6WoDKIa8vUmyiQMXY3Bkg3tYL 58qlHwyccV/IA== 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, Jonathan Corbet , Andrew Morton , Baolin Wang , "Jason A. Donenfeld" , Eric Biggers , Huang Ying , Petr Mladek , tangmeng , "Guilherme G. Piccoli" , Tiezhu Yang , Sebastian Andrzej Siewior , linux-doc@vger.kernel.org, Luis Chamberlain Subject: [PATCH 5.4 14/17] panic: Introduce warn_limit Date: Wed, 1 Feb 2023 20:42:52 -0800 Message-Id: <20230202044255.128815-15-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230202044255.128815-1-ebiggers@kernel.org> References: <20230202044255.128815-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?1756693184542405469?= X-GMAIL-MSGID: =?utf-8?q?1756693184542405469?= From: Kees Cook commit 9fc9e278a5c0b708eeffaf47d6eb0c82aa74ed78 upstream. Like oops_limit, add warn_limit for limiting the number of warnings when panic_on_warn is not set. Cc: Jonathan Corbet Cc: Andrew Morton Cc: Baolin Wang Cc: "Jason A. Donenfeld" Cc: Eric Biggers Cc: Huang Ying Cc: Petr Mladek Cc: tangmeng Cc: "Guilherme G. Piccoli" Cc: Tiezhu Yang Cc: Sebastian Andrzej Siewior Cc: linux-doc@vger.kernel.org Reviewed-by: Luis Chamberlain Signed-off-by: Kees Cook Link: https://lore.kernel.org/r/20221117234328.594699-5-keescook@chromium.org Signed-off-by: Eric Biggers --- Documentation/admin-guide/sysctl/kernel.rst | 10 ++++++++ kernel/panic.c | 27 +++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/admin-guide/sysctl/kernel.rst index bc31c4a88f20f..568c24ff00a72 100644 --- a/Documentation/admin-guide/sysctl/kernel.rst +++ b/Documentation/admin-guide/sysctl/kernel.rst @@ -1186,6 +1186,16 @@ entry will default to 2 instead of 0. 2 Unprivileged calls to ``bpf()`` are disabled = ============================================================= + +warn_limit +========== + +Number of kernel warnings after which the kernel should panic when +``panic_on_warn`` is not set. Setting this to 0 disables checking +the warning count. Setting this to 1 has the same effect as setting +``panic_on_warn=1``. The default value is 0. + + watchdog: ========= diff --git a/kernel/panic.c b/kernel/panic.c index 7e4900eb25ac1..8f72305dd501d 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -44,6 +44,7 @@ static int pause_on_oops_flag; static DEFINE_SPINLOCK(pause_on_oops_lock); bool crash_kexec_post_notifiers; int panic_on_warn __read_mostly; +static unsigned int warn_limit __read_mostly; int panic_timeout = CONFIG_PANIC_TIMEOUT; EXPORT_SYMBOL_GPL(panic_timeout); @@ -60,6 +61,26 @@ ATOMIC_NOTIFIER_HEAD(panic_notifier_list); EXPORT_SYMBOL(panic_notifier_list); +#ifdef CONFIG_SYSCTL +static struct ctl_table kern_panic_table[] = { + { + .procname = "warn_limit", + .data = &warn_limit, + .maxlen = sizeof(warn_limit), + .mode = 0644, + .proc_handler = proc_douintvec, + }, + { } +}; + +static __init int kernel_panic_sysctls_init(void) +{ + register_sysctl_init("kernel", kern_panic_table); + return 0; +} +late_initcall(kernel_panic_sysctls_init); +#endif + static long no_blink(int state) { return 0; @@ -158,8 +179,14 @@ static void panic_print_sys_info(void) void check_panic_on_warn(const char *origin) { + static atomic_t warn_count = ATOMIC_INIT(0); + if (panic_on_warn) panic("%s: panic_on_warn set ...\n", origin); + + if (atomic_inc_return(&warn_count) >= READ_ONCE(warn_limit) && warn_limit) + panic("%s: system warned too often (kernel.warn_limit is %d)", + origin, warn_limit); } /**