Skip to content

Commit

Permalink
Revert "init: Move stack canary initialization after setup_arch"
Browse files Browse the repository at this point in the history
We will correct this after merging upstream.

This reverts commit d4a32a7.
  • Loading branch information
jjpprrrr authored and Kyuofox committed Jul 6, 2022
1 parent 8357d10 commit 2938e2a
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,11 @@ asmlinkage __visible void __init start_kernel(void)
smp_setup_processor_id();
debug_objects_early_init();

/*
* Set up the the initial canary ASAP:
*/
boot_init_stack_canary();

cgroup_init_early();

local_irq_disable();
Expand All @@ -519,10 +524,6 @@ asmlinkage __visible void __init start_kernel(void)
page_address_init();
pr_notice("%s", linux_banner);
setup_arch(&command_line);
/*
* Set up the the initial canary ASAP:
*/
boot_init_stack_canary();
mm_init_cpumask(&init_mm);
setup_command_line(command_line);
setup_nr_cpu_ids();
Expand Down

0 comments on commit 2938e2a

Please sign in to comment.