From: Thomas Gleixner tglx@linutronix.de
mainline inclusion from mainline-v6.5-rc1 commit 7725acaa4f0c04fbefb0e0d342635b967bb7d414 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I7XLNT CVE: CVE-2022-40982
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?i...
---------------------------
commit 7725acaa4f0c04fbefb0e0d342635b967bb7d414 upstream
check_bugs() has become a dumping ground for all sorts of activities to finalize the CPU initialization before running the rest of the init code.
Most are empty, a few do actual bug checks, some do alternative patching and some cobble a CPU advertisement string together....
Aside of that the current implementation requires duplicated function declaration and mostly empty header files for them.
Provide a new function arch_cpu_finalize_init(). Provide a generic declaration if CONFIG_ARCH_HAS_CPU_FINALIZE_INIT is selected and a stub inline otherwise.
This requires a temporary #ifdef in start_kernel() which will be removed along with check_bugs() once the architectures are converted over.
Signed-off-by: Thomas Gleixner tglx@linutronix.de Link: https://lore.kernel.org/r/20230613224544.957805717@linutronix.de Signed-off-by: Daniel Sneddon daniel.sneddon@linux.intel.com Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: Zeng Heng zengheng4@huawei.com --- arch/Kconfig | 3 +++ include/linux/cpu.h | 6 ++++++ init/main.c | 5 +++++ 3 files changed, 14 insertions(+)
diff --git a/arch/Kconfig b/arch/Kconfig index b0319fa3c3ee..0fc9c6d591b8 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -313,6 +313,9 @@ config ARCH_HAS_DMA_SET_UNCACHED config ARCH_HAS_DMA_CLEAR_UNCACHED bool
+config ARCH_HAS_CPU_FINALIZE_INIT + bool + # Select if arch init_task must go in the __init_task_data section config ARCH_TASK_STRUCT_ON_STACK bool diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 224a3acc2b66..56e8599afd5f 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -190,6 +190,12 @@ void arch_cpu_idle_enter(void); void arch_cpu_idle_exit(void); void arch_cpu_idle_dead(void);
+#ifdef CONFIG_ARCH_HAS_CPU_FINALIZE_INIT +void arch_cpu_finalize_init(void); +#else +static inline void arch_cpu_finalize_init(void) { } +#endif + int cpu_report_state(int cpu); int cpu_check_up_prepare(int cpu); void cpu_set_state_online(int cpu); diff --git a/init/main.c b/init/main.c index 21b65f18ba83..e48df2a5f31b 100644 --- a/init/main.c +++ b/init/main.c @@ -1074,7 +1074,12 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void) delayacct_init();
poking_init(); + + arch_cpu_finalize_init(); + /* Temporary conditional until everything has been converted */ +#ifndef CONFIG_ARCH_HAS_CPU_FINALIZE_INIT check_bugs(); +#endif
acpi_subsystem_init(); arch_post_acpi_subsys_init();