mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
init: move stack canary initialization after setup_arch
Patch series "Command line randomness", v3. A series to add the kernel command line as a source of randomness. This patch (of 2): Stack canary intialization involves getting a random number. Getting this random number may involve accessing caches or other architectural specific features which are not available until after the architecture is setup. Move the stack canary initialization later to accommodate this. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Laura Abbott <[email protected]> Signed-off-by: Laura Abbott <[email protected]> Acked-by: Kees Cook <[email protected]> Cc: "Theodore Ts'o" <[email protected]> Cc: Daniel Micay <[email protected]> Cc: Nick Kralevich <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
9367bb730e
commit
121388a313
1 changed files with 5 additions and 6 deletions
11
init/main.c
11
init/main.c
|
|
@ -515,12 +515,6 @@ asmlinkage __visible void __init start_kernel(void)
|
|||
smp_setup_processor_id();
|
||||
debug_objects_early_init();
|
||||
|
||||
/*
|
||||
* Set up the initial canary ASAP:
|
||||
*/
|
||||
add_latent_entropy();
|
||||
boot_init_stack_canary();
|
||||
|
||||
cgroup_init_early();
|
||||
|
||||
local_irq_disable();
|
||||
|
|
@ -534,6 +528,11 @@ 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 and entropy after arch
|
||||
*/
|
||||
add_latent_entropy();
|
||||
boot_init_stack_canary();
|
||||
mm_init_cpumask(&init_mm);
|
||||
setup_command_line(command_line);
|
||||
setup_nr_cpu_ids();
|
||||
|
|
|
|||
Loading…
Reference in a new issue