summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLaura Abbott <lauraa@codeaurora.org>2017-09-08 16:16:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-09-08 18:26:50 -0700
commit121388a31362b0d3176dc1190ac8064b98a61b20 (patch)
treed42a282f3f250a7410d0b841b291bdf8fb0cd403 /init
parent9367bb730e4d9d85a8911a08a3542ec2aa873d37 (diff)
downloadop-kernel-dev-121388a31362b0d3176dc1190ac8064b98a61b20.zip
op-kernel-dev-121388a31362b0d3176dc1190ac8064b98a61b20.tar.gz
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.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>
Diffstat (limited to 'init')
-rw-r--r--init/main.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/init/main.c b/init/main.c
index 949306b..ae5d1fd 100644
--- a/init/main.c
+++ b/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();
OpenPOWER on IntegriCloud