From patchwork Thu Feb 2 04:42:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 51686 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp38442wrn; Wed, 1 Feb 2023 20:48:28 -0800 (PST) X-Google-Smtp-Source: AK7set9huys3MPSXKNFAULBN0Mpq4d7rDeXYr5z/m1VwBXgLEE+9ohrlx6K2Jv+9Goj1Q9TH7Vc+ X-Received: by 2002:a17:90b:1c08:b0:22c:10e2:9e3f with SMTP id oc8-20020a17090b1c0800b0022c10e29e3fmr5187867pjb.0.1675313308128; Wed, 01 Feb 2023 20:48:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675313308; cv=none; d=google.com; s=arc-20160816; b=Ly5pB6UDYlsWUtuGt5nxKkZ66gFbiwBjAnRwIuLktII1TNmRqGsEgNGOd2UYOvMStT YCqOh77v6fCWcR6T6f1lFdAObKNBzcktwu/jgk62cgd77HDdnQrze9hrH7NkOoEyPCyG tI7yIZhv2xtbzJkdRvuMUwuaMucNlnooghYReO6ryWj3aR4Q2q9x1R9jtlxZzFbYjO/S qi8pcSLTo7mocz78N5dM0M7I1tcxyW2gXmREYEugbG5N6eNR2Q5LhIW3vSK0mODNVh0K vVsX/WYjRSPykRRqoV5IX5flnbW6ye4OmghyNx7jkoi/qDAI3CHST+sKVlmCxx8x5xGf abdg== 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=UvguEkpNRav7tA5LzETt2jX0cQidp0HG9DmDJRKY5p4=; b=ZuquM3erBTjrou/2DqTDhO969GMIyzrKiIE8MBFt8uJk3Pyt6NoRxkc309ufPeEFjT /T6o+xVkeASsG5p2UHH1ccZ2nDZp67O3U9/ImS2gzwO2k/m81OIgc+BSrNdvslhrsvl7 duAqeg88n4pgHd5690fuIJ8RUno7JrE2eq6SGJZHwWavW7b3s6xDIxprno1LkadS+EiX RYQvr1e/IMTj5UueUGwWAwzblT/g4T/zxHdsukyQ6Ux1UdvdBi7f1BBYEmxSc4Y4iW6L THyrHqXDFjSwAg83TvrFlvT2Rxy842hj0MHCgJT2v4ic9HnhZKknppsXNe+dZTghDL0U 5qyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dlSzTgDW; 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 i75-20020a639d4e000000b00476990d057asi21220227pgd.472.2023.02.01.20.48.16; Wed, 01 Feb 2023 20:48:28 -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=dlSzTgDW; 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 S231923AbjBBEqM (ORCPT + 99 others); Wed, 1 Feb 2023 23:46:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231899AbjBBEpe (ORCPT ); Wed, 1 Feb 2023 23:45:34 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E74397E065; Wed, 1 Feb 2023 20:44:14 -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 sin.source.kernel.org (Postfix) with ESMTPS id E5EE8CE277A; Thu, 2 Feb 2023 04:43:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36506C433A0; Thu, 2 Feb 2023 04:43:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675313032; bh=5pmjNgpnYqex7VQnVsTlAui4MzRzKxLrogzRqHiHtqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dlSzTgDWcfQVHbIxOWU30QRZsa6UC0nR/HAKxTPBKGRCVPB4BHoMb8ekSFZRMO+B7 ENitPO148BAtIpRxK+4Kmdto3uBT/qRDhAMUDvpoAKVdbbFvB1Z3//J1IsMpkMNG2E odrpaPNBuKqqPGzUHMtCrB0a4I1e5BAXQ39pWQr8C62al00wVOzL6n4LfK04hCCGwg AsnchuGGHE23Yo1Tg5S8Y1UR+b4q0Jd7wbvzNEkTEQD06hWfOvmbSooxMeJjBdzNaO ymc+yPjxaof3UmWMVtByyLmB2TpbN8L+LML2HFf3BATg/Xjis3bKHajPxRSmhns6i0 FmbPmZRgIfoig== 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 5.4 11/17] exit: Expose "oops_count" to sysfs Date: Wed, 1 Feb 2023 20:42:49 -0800 Message-Id: <20230202044255.128815-12-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?1756693326963554391?= X-GMAIL-MSGID: =?utf-8?q?1756693326963554391?= 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 4236970aa4384..48ac68ebab728 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -63,6 +63,7 @@ #include #include #include +#include #include #include @@ -96,6 +97,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--; @@ -893,8 +913,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.