This is a note to let you know that I've just added the patch titled
panic: Separate sysctl logic from CONFIG_SMP
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
panic-separate-sysctl-logic-from-config_smp.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 9360d035a579d95d1e76c471061b9065b18a0eb1 Mon Sep 17 00:00:00 2001
From: Kees Cook <keescook@xxxxxxxxxxxx>
Date: Thu, 17 Nov 2022 15:43:21 -0800
Subject: panic: Separate sysctl logic from CONFIG_SMP
From: Kees Cook <keescook@xxxxxxxxxxxx>
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@xxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: tangmeng <tangmeng@xxxxxxxxxxxxx>
Cc: "Guilherme G. Piccoli" <gpiccoli@xxxxxxxxxx>
Cc: Tiezhu Yang <yangtiezhu@xxxxxxxxxxx>
Cc: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
Reviewed-by: Luis Chamberlain <mcgrof@xxxxxxxxxx>
Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20221117234328.594699-1-keescook@xxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
kernel/panic.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -75,8 +75,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,
@@ -86,6 +87,7 @@ static struct ctl_table kern_panic_table
.extra1 = SYSCTL_ZERO,
.extra2 = SYSCTL_ONE,
},
+#endif
{ }
};
Patches currently in stable-queue which might be from keescook@xxxxxxxxxxxx are
queue-6.1/panic-consolidate-open-coded-panic_on_warn-checks.patch
queue-6.1/exit-put-an-upper-limit-on-how-often-we-can-oops.patch
queue-6.1/panic-introduce-warn_limit.patch
queue-6.1/exit-allow-oops_limit-to-be-disabled.patch
queue-6.1/panic-separate-sysctl-logic-from-config_smp.patch
queue-6.1/exit-use-read_once-for-all-oops-warn-limit-reads.patch
queue-6.1/exit-expose-oops_count-to-sysfs.patch
queue-6.1/panic-expose-warn_count-to-sysfs.patch
queue-6.1/docs-fix-path-paste-o-for-sys-kernel-warn_count.patch
