Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5c0040f authored by Jason A. Donenfeld's avatar Jason A. Donenfeld Committed by Greg Kroah-Hartman
Browse files

init: call time_init() before rand_initialize() 



commit fe222a6ca2d53c38433cba5d3be62a39099e708e upstream.

Currently time_init() is called after rand_initialize(), but
rand_initialize() makes use of the timer on various platforms, and
sometimes this timer needs to be initialized by time_init() first. In
order for random_get_entropy() to not return zero during early boot when
it's potentially used as an entropy source, reverse the order of these
two calls. The block doing random initialization was right before
time_init() before, so changing the order shouldn't have any complicated
effects.

Cc: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarStafford Horne <shorne@gmail.com>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e50058c2

init/main.c

+2 −1
Original line number Diff line number Diff line
@@ -633,11 +633,13 @@ asmlinkage __visible void __init start_kernel(void) 
	hrtimers_init();

	softirq_init();

	timekeeping_init();

	time_init();



	/*

	 * For best initial stack canary entropy, prepare it after:

	 * - setup_arch() for any UEFI RNG entropy and boot cmdline access

	 * - timekeeping_init() for ktime entropy used in rand_initialize()

	 * - time_init() for making random_get_entropy() work on some platforms

	 * - rand_initialize() to get any arch-specific entropy like RDRAND

	 * - add_latent_entropy() to get any latent entropy

	 * - adding command line entropy
@@ -647,7 +649,6 @@ asmlinkage __visible void __init start_kernel(void) 
	add_device_randomness(command_line, strlen(command_line));

	boot_init_stack_canary();



	time_init();

	perf_event_init();

	profile_init();

	call_function_init();