Skip to content

Commit

Permalink
init: move stack canary initialization after setup_arch
Browse files Browse the repository at this point in the history
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.com
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Signed-off-by: Laura Abbott <labbott@redhat.com>
Acked-by: Kees 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
labbott authored and torvalds committed Sep 9, 2017
1 parent 9367bb7 commit 121388a
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
Expand Down

0 comments on commit 121388a

Please sign in to comment.