From patchwork Thu Feb 2 05:26:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 51702 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp52707wrn; Wed, 1 Feb 2023 21:30:15 -0800 (PST) X-Google-Smtp-Source: AK7set8uX5c8wRn/VUGDLejkD8utV7uPIBcRqzzPuaoOg30YW77Cr5Urdkb/G4v+4SAAOS8uOQnV X-Received: by 2002:a17:90b:1d02:b0:22e:61be:774d with SMTP id on2-20020a17090b1d0200b0022e61be774dmr5368849pjb.16.1675315815222; Wed, 01 Feb 2023 21:30:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675315815; cv=none; d=google.com; s=arc-20160816; b=0EQo/ZFWRcnL0ofSsbpA5H593p3fSJ5HnqTvBep+pBAzFEUcwHIuX6Z/kUsOFGjEqr v97pvo7P43kJFJiZoj5bqxyWr1SmDrPP0iQUaeUWvTG0WTfwOcRNWX/4KMkXBHxlhay1 X8VKJhfJABG0wFnjWOmImwz6s8SBXX0A0WrQO6FE0XcfoLipvt96Hq6NsXGe/3EQTWCd mOzRikTHhxepHAfTi/FTd/9Gx04AHuMsu8CLlur4VgBqNqfflJCl5+0yInNHJ4djbi4t w4rHXoF+dk+BAS/EwsYWyV6caTWMz7NZ2euO2v43BDJeHJl+560POAueJjVEt4Yyssj4 kUWA== 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=TZji9KvnUEHLfVcLIl8u2LSFYWQGy3myJIRCfXbSjyU=; b=rVygvKUMtBlmsvH4GOQjYvVUv5zpyeMA6mzGLoXGHjdTTj1Y8clm2hM+A71+AO1ajE XyQXzWGPp/MKB6+z/wRoMb+jluznZMaMSOfXp4R+hVJam7GDr3Gxboq0LCv2QM4oZboJ ISd5mcWVopU25RGqjJr9xozrXnFTGNviq9db/IEtOV+4zjdAq9GcRw4VZnpLDoT4/HiC a8YfjKpzjd7iM0uKQCOsQU0RTzOhJ4idEaf6BbewQ02Kiso5Kzm1szEOJBqOZ5ebySKN 8eLrSfzFa6K6RyejfiJEJazD1BFqscWVSLkwyNExu78X6cxWhitej8DNs6orVUtkEAL3 qIzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dnCHJDta; 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 lx12-20020a17090b4b0c00b002300d3d23a9si4343829pjb.7.2023.02.01.21.30.02; Wed, 01 Feb 2023 21:30:15 -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=dnCHJDta; 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 S232168AbjBBF3Y (ORCPT + 99 others); Thu, 2 Feb 2023 00:29:24 -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 S232014AbjBBF2f (ORCPT ); Thu, 2 Feb 2023 00:28:35 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E39C91F907; Wed, 1 Feb 2023 21:28:12 -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 252DCB824B3; Thu, 2 Feb 2023 05:28:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 689FAC433EF; Thu, 2 Feb 2023 05:28:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675315689; bh=WvfZsR/qctVDMMgvWrh4xPNS2c2uTlwTbpaBFr6WSq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dnCHJDtasr2f19ob2DGAk4L2OdO0F3EAo9u/6S0r4glJmrQgyIMB/iYHo3gmdz5ZT NNNHnHNUWlt9yGJz4D4EZNWQvtDDHrQbgNr2hNEQOr/bGMRux9FNoJXn/7KlmYChto q3NggTNo7QLa+gNGA/ceIX6n26A0p15PRqEwp5bHhaxm0arIQ5EbWyxdNxE65DFEd0 qFvKXwD65Yi4Frup0lTJ6tBJa1oiCBoiWRPuFkQ2rxBbsGLoK5cHRLkzzrHL7QPFO+ k+JnbE+U4R2mPM+47lOllum3i6jFfmNf+YD3qHjl/k5/TYkZUF9O4xGX8kZ61PFV4f sEkbQbz5LHnsw== 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, Petr Mladek , Andrew Morton , tangmeng , "Guilherme G. Piccoli" , Sebastian Andrzej Siewior , Tiezhu Yang , Luis Chamberlain Subject: [PATCH 4.19 14/16] panic: Expose "warn_count" to sysfs Date: Wed, 1 Feb 2023 21:26:02 -0800 Message-Id: <20230202052604.179184-15-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=-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?1756695956204167038?= X-GMAIL-MSGID: =?utf-8?q?1756695956204167038?= From: Kees Cook commit 8b05aa26336113c4cea25f1c333ee8cd4fc212a6 upstream. Since Warn count is now tracked and is a fairly interesting signal, add the entry /sys/kernel/warn_count to expose it to userspace. Cc: Petr Mladek Cc: Andrew Morton Cc: tangmeng Cc: "Guilherme G. Piccoli" Cc: Sebastian Andrzej Siewior Cc: Tiezhu Yang Reviewed-by: Luis Chamberlain Signed-off-by: Kees Cook Link: https://lore.kernel.org/r/20221117234328.594699-6-keescook@chromium.org Signed-off-by: Eric Biggers --- .../ABI/testing/sysfs-kernel-warn_count | 6 +++++ kernel/panic.c | 22 +++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-warn_count diff --git a/Documentation/ABI/testing/sysfs-kernel-warn_count b/Documentation/ABI/testing/sysfs-kernel-warn_count new file mode 100644 index 0000000000000..08f083d2fd51b --- /dev/null +++ b/Documentation/ABI/testing/sysfs-kernel-warn_count @@ -0,0 +1,6 @@ +What: /sys/kernel/oops_count +Date: November 2022 +KernelVersion: 6.2.0 +Contact: Linux Kernel Hardening List +Description: + Shows how many times the system has Warned since last boot. diff --git a/kernel/panic.c b/kernel/panic.c index d1a5360262f04..dbb6e27d33e10 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #define PANIC_TIMER_STEP 100 @@ -71,6 +72,25 @@ static __init int kernel_panic_sysctls_init(void) late_initcall(kernel_panic_sysctls_init); #endif +static atomic_t warn_count = ATOMIC_INIT(0); + +#ifdef CONFIG_SYSFS +static ssize_t warn_count_show(struct kobject *kobj, struct kobj_attribute *attr, + char *page) +{ + return sysfs_emit(page, "%d\n", atomic_read(&warn_count)); +} + +static struct kobj_attribute warn_count_attr = __ATTR_RO(warn_count); + +static __init int kernel_panic_sysfs_init(void) +{ + sysfs_add_file_to_group(kernel_kobj, &warn_count_attr.attr, NULL); + return 0; +} +late_initcall(kernel_panic_sysfs_init); +#endif + static long no_blink(int state) { return 0; @@ -148,8 +168,6 @@ EXPORT_SYMBOL(nmi_panic); 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);