Commit 121388a3 authored by Laura Abbott's avatar Laura Abbott Committed by Linus Torvalds

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/20170816231458.2299-2-labbott@redhat.comSigned-off-by: default avatarLaura Abbott <lauraa@codeaurora.org>
Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
Acked-by: default avatarKees Cook <keescook@chromium.org>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Daniel Micay <danielmicay@gmail.com>
Cc: Nick Kralevich <nnk@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9367bb73
...@@ -515,12 +515,6 @@ asmlinkage __visible void __init start_kernel(void) ...@@ -515,12 +515,6 @@ asmlinkage __visible void __init start_kernel(void)
smp_setup_processor_id(); smp_setup_processor_id();
debug_objects_early_init(); debug_objects_early_init();
/*
* Set up the initial canary ASAP:
*/
add_latent_entropy();
boot_init_stack_canary();
cgroup_init_early(); cgroup_init_early();
local_irq_disable(); local_irq_disable();
...@@ -534,6 +528,11 @@ asmlinkage __visible void __init start_kernel(void) ...@@ -534,6 +528,11 @@ asmlinkage __visible void __init start_kernel(void)
page_address_init(); page_address_init();
pr_notice("%s", linux_banner); pr_notice("%s", linux_banner);
setup_arch(&command_line); 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); mm_init_cpumask(&init_mm);
setup_command_line(command_line); setup_command_line(command_line);
setup_nr_cpu_ids(); setup_nr_cpu_ids();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment