diff mbox series

[5.10,12/20] panic: Separate sysctl logic from CONFIG_SMP

Message ID	20230124193004.206841-13-ebiggers@kernel.org
State	New
Headers	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; 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 Message-Id: <20230124193004.206841-13-ebiggers@kernel.org> In-Reply-To: <20230124193004.206841-1-ebiggers@kernel.org> References: <20230124193004.206841-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Backport oops_limit to 5.10 \| [5.10,00/20] Backport oops_limit to 5.10 [5.10,01/20] sysctl: add a new register_sysctl_init() interface [5.10,02/20] kernel/panic: move panic sysctls to its own file [5.10,03/20] panic: unset panic_on_warn inside panic() [5.10,04/20] ubsan: no need to unset panic_on_warn in ubsan_epilogue() [5.10,05/20] kasan: no need to unset panic_on_warn in end_report() [5.10,06/20] exit: Add and use make_task_dead. [5.10,07/20] objtool: Add a missing comma to avoid string concatenation [5.10,08/20] hexagon: Fix function name in die() [5.10,09/20] h8300: Fix build errors from do_exit() to make_task_dead() transition [5.10,10/20] csky: Fix function name in csky_alignment() and die() [5.10,11/20] ia64: make IA64_MCA_RECOVERY bool instead of tristate [5.10,12/20] panic: Separate sysctl logic from CONFIG_SMP [5.10,13/20] exit: Put an upper limit on how often we can oops [5.10,14/20] exit: Expose "oops_count" to sysfs [5.10,15/20] exit: Allow oops_limit to be disabled [5.10,16/20] panic: Consolidate open-coded panic_on_warn checks [5.10,17/20] panic: Introduce warn_limit [5.10,18/20] panic: Expose "warn_count" to sysfs [5.10,19/20] docs: Fix path paste-o for /sys/kernel/warn_count [5.10,20/20] exit: Use READ_ONCE() for all oops/warn limit reads

Commit Message

Eric Biggers Jan. 24, 2023, 7:29 p.m. UTC

  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 mbox series

Patch

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
 	{ }
 };