From: Peter Zijlstra peterz@infradead.org
mainline inclusion from mainline-v6.2-rc1 commit 5b93a83649c7cba3a15eb7e8959b250841acb1b1 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 5b93a83649c7cba3a15eb7e8959b250841acb1b1 upstream.
Move poking_init() up a bunch; specifically move it right after mm_init() which is right before ftrace_init().
This will allow simplifying ftrace text poking which currently has a bunch of exceptions for early boot.
Signed-off-by: Peter Zijlstra (Intel) peterz@infradead.org Link: https://lkml.kernel.org/r/20221025201057.881703081@infradead.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org Signed-off-by: Zeng Heng zengheng4@huawei.com --- init/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/init/main.c b/init/main.c index 342b6226ac4e..f06fbe79a84a 100644 --- a/init/main.c +++ b/init/main.c @@ -929,7 +929,7 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void) sort_main_extable(); trap_init(); mm_init(); - + poking_init(); ftrace_init();
/* trace_printk can be enabled here */ @@ -1065,8 +1065,6 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void) taskstats_init_early(); delayacct_init();
- poking_init(); - acpi_subsystem_init(); arch_post_acpi_subsys_init(); sfi_init_late();