Commit 13687b32 authored by Kees Cook's avatar Kees Cook Committed by sanglipeng
Browse files

panic: Separate sysctl logic from CONFIG_SMP 

stable inclusion
from stable-v5.10.166
commit 191a3b17dd9b55dc92283935247f8a854e6fffba
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7TH9O

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=191a3b17dd9b55dc92283935247f8a854e6fffba



--------------------------------

commit 9360d035 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: default avatarLuis Chamberlain <mcgrof@kernel.org>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20221117234328.594699-1-keescook@chromium.org


Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 3bd8e946

kernel/panic.c

+3 −1
Original line number Diff line number Diff line
@@ -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

	{ }

};