From patchwork Fri Feb 3 00:27:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 52226 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp555805wrn; Thu, 2 Feb 2023 16:29:48 -0800 (PST) X-Google-Smtp-Source: AK7set9fmZ3DSuJ6W5ZYWy5edjf6hMXN9JaogWvMBbInZuQrqxNiy8ivV3KAH7Y48BDDq8GoRr2x X-Received: by 2002:a17:903:1247:b0:195:e92e:c4d3 with SMTP id u7-20020a170903124700b00195e92ec4d3mr10461013plh.46.1675384188278; Thu, 02 Feb 2023 16:29:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675384188; cv=none; d=google.com; s=arc-20160816; b=OPw9dr5pK/OBo5Jc4Z9yYtPd8JkDM48VGF4uB2av+u7LevIY/cqGUAM10Og+P4ljAo XEMMj6UPyeN37/jPil5ZsGkbjMbE/dxD7r8CgHtiwKCqciT9JynErImDOu/gDe4OuXB7 MB8g9W8oD1DQNAdEP/f32WkX0HfzTh4GBY60eDcriv/ZPKpT2y1QcWmsOjIzqbHNdpOj Ej5ogNKZ/NuF8BatocczrFPT8J1eZGw7EAOGznNf7Kiz6UDRa5DPje+W+UgHW7tNXM3G tW6mv2EumQuo7zIBxJRk8I7owpaEux87ylIpd3nMwie/8I+tsPKmBfBhg36HF4BqPhNI Xw3A== 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=xXXBSFBpH/w/zkbWV667NnaIg050b/kgNIz+X0gPMSI=; b=CQ5KH/8UnF8Sak6uKZLe7HvPZGYzL2ZFr4MSPwQM93ngBTSUPHXwPHTCEFt4BE+eVs +XVFFrXbQBRyYgezaIMrzujQRlrGh84toxpqq06UsjL4OYCjgfGUAAMHq2fWtG41x9uz X9vlFrj5TRDlzckO4PEL8p9ChJz8acAHl1CkX+o1bYCeO7mnqKzkpPwtiP9UBSATgnMj 1vKVyrkw4m9ivd7kq33g+pZiXsODu1PCroecf+iS11jLrzPKPqcQBvjUAGeVZJx6TQHF 5DIlhcCPgajs7f9bajqSJp1XgztKCKvt4BwY7FIHfB456mUw2iTq9COZGz7It2geSynd IWuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ng0nzeks; 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 y12-20020a170902700c00b00198dd36c9ccsi496354plk.47.2023.02.02.16.29.36; Thu, 02 Feb 2023 16:29:48 -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=Ng0nzeks; 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 S233421AbjBCA2h (ORCPT + 99 others); Thu, 2 Feb 2023 19:28:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233066AbjBCA2P (ORCPT ); Thu, 2 Feb 2023 19:28:15 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93AE437544; Thu, 2 Feb 2023 16:28:10 -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 2DE69B828D9; Fri, 3 Feb 2023 00:28:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D407C4339C; Fri, 3 Feb 2023 00:28:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675384087; bh=mLCdAaBunvOHoCrOt7GOusY5wCBMyBacAnEmb2lGEsw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ng0nzeksclBJ6n1AC5LHkpYbhtqc4r78Uftsp/FflFnxVkzD2YIASiUadFEachfBi 5A9pmYBmme0kriuTOYrzyleWQu/K4Eg0cRB1kjqthKoiC0ADSBiAzmqrdCi3a9WurM +US8HC9pf89mIRkH/YKjDGCO15yvUICx9p60HKteIYa/7tbsCeGfK/SE9v0AqTbPCl 7Mp6fMVsCTI2C6zRONo8Wvoq5ExnLE6C4uH82vg6qAJj1bg5B+Ct4kQFtWWUsJcQdI 49wILWJPdnCfHDcZtQQF0o5G//pzwh5pve4t3hEQaK5bgqAFQK1VvPX52YuB9ns95Z 737aw8Q/TB+2A== 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 , Luis Chamberlain Subject: [PATCH 4.19 v2 09/15] exit: Expose "oops_count" to sysfs Date: Thu, 2 Feb 2023 16:27:11 -0800 Message-Id: <20230203002717.49198-10-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?1756767650522739305?= X-GMAIL-MSGID: =?utf-8?q?1756767650522739305?= From: Kees Cook commit 9db89b41117024f80b38b15954017fb293133364 upstream. Since Oops count is now tracked and is a fairly interesting signal, add the entry /sys/kernel/oops_count to expose it to userspace. Cc: "Eric W. Biederman" Cc: Jann Horn Cc: Arnd Bergmann Reviewed-by: Luis Chamberlain Signed-off-by: Kees Cook Link: https://lore.kernel.org/r/20221117234328.594699-3-keescook@chromium.org Signed-off-by: Eric Biggers --- .../ABI/testing/sysfs-kernel-oops_count | 6 +++++ kernel/exit.c | 22 +++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-oops_count diff --git a/Documentation/ABI/testing/sysfs-kernel-oops_count b/Documentation/ABI/testing/sysfs-kernel-oops_count new file mode 100644 index 0000000000000..156cca9dbc960 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-kernel-oops_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 Oopsed since last boot. diff --git a/kernel/exit.c b/kernel/exit.c index fa3004ff33362..5cd8a34257650 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -62,6 +62,7 @@ #include #include #include +#include #include #include @@ -95,6 +96,25 @@ static __init int kernel_exit_sysctls_init(void) late_initcall(kernel_exit_sysctls_init); #endif +static atomic_t oops_count = ATOMIC_INIT(0); + +#ifdef CONFIG_SYSFS +static ssize_t oops_count_show(struct kobject *kobj, struct kobj_attribute *attr, + char *page) +{ + return sysfs_emit(page, "%d\n", atomic_read(&oops_count)); +} + +static struct kobj_attribute oops_count_attr = __ATTR_RO(oops_count); + +static __init int kernel_exit_sysfs_init(void) +{ + sysfs_add_file_to_group(kernel_kobj, &oops_count_attr.attr, NULL); + return 0; +} +late_initcall(kernel_exit_sysfs_init); +#endif + static void __unhash_process(struct task_struct *p, bool group_dead) { nr_threads--; @@ -951,8 +971,6 @@ EXPORT_SYMBOL_GPL(do_exit); void __noreturn make_task_dead(int signr) { - static atomic_t oops_count = ATOMIC_INIT(0); - /* * Take the task off the cpu after something catastrophic has * happened.