From: Eric Biggers <ebiggers@kernel.org>
To: stable@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Kees Cook <keescook@chromium.org>, SeongJae Park <sj@kernel.org>,
Seth Jenkins <sethjenkins@google.com>,
Jann Horn <jannh@google.com>,
"Eric W . Biederman" <ebiederm@xmission.com>,
linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org,
Petr Mladek <pmladek@suse.com>,
Andrew Morton <akpm@linux-foundation.org>,
tangmeng <tangmeng@uniontech.com>,
"Guilherme G. Piccoli" <gpiccoli@igalia.com>,
Tiezhu Yang <yangtiezhu@loongson.cn>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH 5.10 12/20] panic: Separate sysctl logic from CONFIG_SMP
Date: Tue, 24 Jan 2023 11:29:56 -0800 [thread overview]
Message-ID: <20230124193004.206841-13-ebiggers@kernel.org> (raw)
In-Reply-To: <20230124193004.206841-1-ebiggers@kernel.org>
From: Kees Cook <keescook@chromium.org>
commit 9360d035a579d95d1e76c471061b9065b18a0eb1 upstream.
In preparation for adding more sysctls directly in kernel/panic.c, split
CONFIG_SMP from the logic that adds sysctls.
Cc: Petr Mladek <pmladek@suse.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: tangmeng <tangmeng@uniontech.com>
Cc: "Guilherme G. Piccoli" <gpiccoli@igalia.com>
Cc: Tiezhu Yang <yangtiezhu@loongson.cn>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20221117234328.594699-1-keescook@chromium.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
kernel/panic.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/kernel/panic.c b/kernel/panic.c
index 960c2be2759cb..09f0802212c38 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -72,8 +72,9 @@ ATOMIC_NOTIFIER_HEAD(panic_notifier_list);
EXPORT_SYMBOL(panic_notifier_list);
-#if defined(CONFIG_SMP) && defined(CONFIG_SYSCTL)
+#ifdef CONFIG_SYSCTL
static struct ctl_table kern_panic_table[] = {
+#ifdef CONFIG_SMP
{
.procname = "oops_all_cpu_backtrace",
.data = &sysctl_oops_all_cpu_backtrace,
@@ -83,6 +84,7 @@ static struct ctl_table kern_panic_table[] = {
.extra1 = SYSCTL_ZERO,
.extra2 = SYSCTL_ONE,
},
+#endif
{ }
};
--
2.39.1
next prev parent reply other threads:[~2023-01-24 19:35 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-24 19:29 [PATCH 5.10 00/20] Backport oops_limit to 5.10 Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 01/20] sysctl: add a new register_sysctl_init() interface Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 02/20] kernel/panic: move panic sysctls to its own file Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 03/20] panic: unset panic_on_warn inside panic() Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 04/20] ubsan: no need to unset panic_on_warn in ubsan_epilogue() Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 05/20] kasan: no need to unset panic_on_warn in end_report() Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 06/20] exit: Add and use make_task_dead Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 07/20] objtool: Add a missing comma to avoid string concatenation Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 08/20] hexagon: Fix function name in die() Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 09/20] h8300: Fix build errors from do_exit() to make_task_dead() transition Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 10/20] csky: Fix function name in csky_alignment() and die() Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 11/20] ia64: make IA64_MCA_RECOVERY bool instead of tristate Eric Biggers
2023-01-24 19:29 ` Eric Biggers [this message]
2023-01-24 19:29 ` [PATCH 5.10 13/20] exit: Put an upper limit on how often we can oops Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 14/20] exit: Expose "oops_count" to sysfs Eric Biggers
2023-01-24 19:29 ` [PATCH 5.10 15/20] exit: Allow oops_limit to be disabled Eric Biggers
2023-01-24 19:30 ` [PATCH 5.10 16/20] panic: Consolidate open-coded panic_on_warn checks Eric Biggers
2023-01-24 19:30 ` [PATCH 5.10 17/20] panic: Introduce warn_limit Eric Biggers
2023-01-24 19:30 ` [PATCH 5.10 18/20] panic: Expose "warn_count" to sysfs Eric Biggers
2023-01-24 19:30 ` [PATCH 5.10 19/20] docs: Fix path paste-o for /sys/kernel/warn_count Eric Biggers
2023-01-24 19:30 ` [PATCH 5.10 20/20] exit: Use READ_ONCE() for all oops/warn limit reads Eric Biggers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230124193004.206841-13-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=bigeasy@linutronix.de \
--cc=ebiederm@xmission.com \
--cc=gpiccoli@igalia.com \
--cc=gregkh@linuxfoundation.org \
--cc=jannh@google.com \
--cc=keescook@chromium.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=pmladek@suse.com \
--cc=sethjenkins@google.com \
--cc=sj@kernel.org \
--cc=stable@vger.kernel.org \
--cc=tangmeng@uniontech.com \
--cc=yangtiezhu@loongson.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).