From patchwork Tue Jan 24 18:51:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 47832 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2319138wrn; Tue, 24 Jan 2023 10:54:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXsTDQQ5eqBtyl4GJPKTezvQFUrlHzoZIYLy0HLYHnWHyFCirJGHtvfZnlwjba6IUkNUZ5T8 X-Received: by 2002:a05:6a20:4407:b0:b8:5835:2573 with SMTP id ce7-20020a056a20440700b000b858352573mr42150084pzb.60.1674586446854; Tue, 24 Jan 2023 10:54:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674586446; cv=none; d=google.com; s=arc-20160816; b=pCZibZgUhwtP16F3XT+ePv19eUt+mnCcuRNPmESITWDzix4dA1yvm5gIEzO4RRIGdj i5uLPbfPgih7QH7FRkVXHTVswtyMvQQsN0DMOgBid251ErzCCc8dozSG18XP0S8EaWch ENayKt5zz/AF+RlUSUTW2wTboq+atbWUBC8oy6VQaI5+QIkxgoeJQArXv3x//qudz0TC Fc/Ry08sfQXOpmjhhIKlUpizXhTgJAeNrvZM7EEHnXLTPzn6XnKIob6g2st8QRYHWnjR JVToYjtBdAJYNmibNLO67s1MFE/z2cCWz11n4p6kAs5IDV3jDl9j9k64yXHuQaXDvS2O E9IA== 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=Fi2E6IlnA1c72bh39cdK8DiYGFCrCRAn3lHGH1gAzRU=; b=vELyoC1gw0QvMpw4SwNlUpFV1qw9IMEjIzlcRFmUZ0L+NS8ugPelt+R75A/3qvdyyf kVPpuSrtPydnggCGJd1PO/5lY3XgwrmdXmYqPQvE79sTA0v2aiysUvVvb6vNWvWlFNJJ JTHg4eYGlLvRU/1HqreCycgbgXgpj08rRc9EsxjFgUCqhFhQld1I5sPNh1XBvLuknXMt 5emO1AnjyQiH3yo7My8G9eBho2sGo0LvKt56olMNa3SkIXZ3m4LJG75RdB8yG5SqTMht +yUBljbWD7xy6Q43b6RcwbKTFJU06n+BtQ3jx77fQrpT5HikESreEtwTyYSVXqbvYJFH JJVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="vOoh/QbQ"; 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 l69-20020a638848000000b004d0066c7156si2860785pgd.588.2023.01.24.10.53.55; Tue, 24 Jan 2023 10:54:06 -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="vOoh/QbQ"; 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 S234512AbjAXSxJ (ORCPT + 99 others); Tue, 24 Jan 2023 13:53:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230214AbjAXSwi (ORCPT ); Tue, 24 Jan 2023 13:52:38 -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 DAE5C4DE29; Tue, 24 Jan 2023 10:52:13 -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 4CCFE6132D; Tue, 24 Jan 2023 18:52:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37298C433A8; Tue, 24 Jan 2023 18:52:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674586332; bh=uJNdiP3sP+wXY0anj6obLD3qCdsvZCuU0Y8rZXFqjFc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vOoh/QbQ5/sWEoKnIz+uzZa+qLghMayxPEZ6LQmVhLHnRAf4EJmpjlgFbp5tmtyf0 J0Y4dormEKBD7cp1avPPTPHjJOUcv2h278iN+62ZifiqNY7Q7Ac/2xB/8UnDG7BDzK 6Jn/a1SPL9tZMLuqDpOtZGhu6xbTFyjfqN2D8la98mOL/rM7QAl1S0mqcq6p8GxrnY FFczikOiuDIR6CofUTXsQ7Uj0WUvz/oyUyPPPSMd1eVVWB6zlYBloOBnwdcc7t6apL hXBry27DT/axW9fcG/HKfeMU/IFiXsKjsNJ4aqfKA63yaQIxCPWEBj11l1Dqp789D1 p2FOqyWzKZq4g== From: Eric Biggers To: stable@vger.kernel.org, Greg Kroah-Hartman Cc: 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 5.15 18/20] panic: Expose "warn_count" to sysfs Date: Tue, 24 Jan 2023 10:51:08 -0800 Message-Id: <20230124185110.143857-19-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230124185110.143857-1-ebiggers@kernel.org> References: <20230124185110.143857-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?1755931157857343212?= X-GMAIL-MSGID: =?utf-8?q?1755931157857343212?= 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 604d7ad77042e..4aef355e9a5d1 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #define PANIC_TIMER_STEP 100 @@ -105,6 +106,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; @@ -203,8 +223,6 @@ 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);