The patch titled
Subject: init: move stack canary initialization after setup_arch
has been removed from the -mm tree. Its filename was
init-move-stack-canary-initialization-after-setup_arch.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Laura Abbott <lauraa@xxxxxxxxxxxxxx>
Subject: 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@xxxxxxxxxx
Signed-off-by: Laura Abbott <lauraa@xxxxxxxxxxxxxx>
Signed-off-by: Laura Abbott <labbott@xxxxxxxxxx>
Acked-by: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: "Theodore Ts'o" <tytso@xxxxxxx>
Cc: Daniel Micay <danielmicay@xxxxxxxxx>
Cc: Nick Kralevich <nnk@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
init/main.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff -puN init/main.c~init-move-stack-canary-initialization-after-setup_arch init/main.c
--- a/init/main.c~init-move-stack-canary-initialization-after-setup_arch
+++ a/init/main.c
@@ -515,12 +515,6 @@ asmlinkage __visible void __init start_k
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_k
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();
_
Patches currently in -mm which might be from lauraa@xxxxxxxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
