From patchwork Thu Feb 2 05:44:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 51720 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp57827wrn; Wed, 1 Feb 2023 21:46:58 -0800 (PST) X-Google-Smtp-Source: AK7set/eJjKbvKHtoG4AyPcFrg9bSJHMXiki0TsIwAyuYDqWx5elPZ4xvN4ADgIswik55P9LxFLy X-Received: by 2002:a05:6a20:7da4:b0:bd:79a:a215 with SMTP id v36-20020a056a207da400b000bd079aa215mr7079043pzj.29.1675316817882; Wed, 01 Feb 2023 21:46:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675316817; cv=none; d=google.com; s=arc-20160816; b=CarIyJm3Io7CQ0Kop8CgbNLi46rAfQ7NCqOAp28gals/M0rv9eCsQRgaOM5Mhwb5cB xc/blxKotDA4YKp2w01uyYQXGlncZTM35j3fRcuekeOeEi+zwrz66l+e48CI2seKADcF ExueKzRTYnfwyXK4r8e5vrx8af/4U3EfX3ai27Ot2w5HhULJ9ufpYgGMHOllmngHIUrc rdNpbAD80j4S6WaYd2hOEO3DtixBN5DML9tMenk2Z66iGbNwpHbwZwBvpJhxmSEVIQXN tnFKgLl82Sxwm+tGT1zr9NvVLRvQQuzywj6+VrwHPdXBY0LhHy7ZZ/YhzWRKqkpYySH8 zNhA== 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=76RRolvZ1i7tDqVVGKkpPSGPut66fQ8LXBZ7DxBHhSM=; b=MyE9NK1/+Td1dHLnN6tyvlKBzI4ZCsXqwYcW5THrnQcaP4LXDY3ZCOcWKf1bgi+ktz UVOQtednj/LFIwyVTq4l1zEtp92b0c012cm0QEYGZ2RM9/WopyI1r+oZalOFYnh1cmBh 8MLadvccLjaOwF5QZ1mDBIELwJDtexno+j9SLAkjSpmI60KRN4ZvJrdmev7zdIYHzjEC pXDPTp03o/uOwVyoXQnuC/sCU+9TSMNtPgZaEMKfclxtrOxt+KA0GDBiD+vMOr41d3I8 DzbEgVhAT6QeN+/jHR0PMHsKYyZG9K1iIoy+OH2XwdLr8l9NQCyF0LDSx21SQnwSIP63 XyCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nDzeGMFn; 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 q2-20020a63bc02000000b004f23ec80e58si303668pge.208.2023.02.01.21.46.44; Wed, 01 Feb 2023 21:46:57 -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=nDzeGMFn; 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 S232032AbjBBFqG (ORCPT + 99 others); Thu, 2 Feb 2023 00:46:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230375AbjBBFp1 (ORCPT ); Thu, 2 Feb 2023 00:45:27 -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 6EBAE474E6; Wed, 1 Feb 2023 21:45:26 -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 0AC7A6150C; Thu, 2 Feb 2023 05:45:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 82F4BC4339B; Thu, 2 Feb 2023 05:45:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675316725; bh=NvHqmOgG2aAfs54Rnjd2jLih4AMjzsSDG6iFMQBllZY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nDzeGMFnqc25P7VvHZgMcUsQM0iTsM9f/ufUyPfc0uUMhtmfNZP3GwR3IvcfAvyjk Imy4joa/KW4NWMuHkdgDnkJBzRVrd9493D900R9m2uMrX5OUUpya5uBaz9xNO0hS5a o2xtffj+BOud4aduCWunbfIcDET0aGIWjm/rA40ZGYvDvXmnUHxJh2ZkjdnEUgb99P 2zOuu4KniRLJhaKKdQX0rKKv5h+TpBFyNnEQObcY/6nohmDXzNMsE3BF1mbf54siaQ sGjLxGManBAZwfKvkHrn0ktr+dKz5KNc6VCJb67QNE1Bpa0Ka9MHIjSADLC2nZaI3C S2GdP0BstqGrQ== 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.14 10/16] exit: Expose "oops_count" to sysfs Date: Wed, 1 Feb 2023 21:44:00 -0800 Message-Id: <20230202054406.221721-11-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230202054406.221721-1-ebiggers@kernel.org> References: <20230202054406.221721-1-ebiggers@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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?1756697007313559934?= X-GMAIL-MSGID: =?utf-8?q?1756697007313559934?= 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 482bcaf158127..138b110bf83a1 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--; @@ -949,8 +969,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.