random: handle latent entropy and command line from random_init()

commit 2f14062bb14b0fcfcc21e6dc7d5b5c0d25966164 upstream.

Currently, start_kernel() adds latent entropy and the command line to
the entropy bool *after* the RNG has been initialized, deferring when
it's actually used by things like stack canaries until the next time
the pool is seeded. This surely is not intended.

Rather than splitting up which entropy gets added where and when between
start_kernel() and random_init(), just do everything in random_init(),
which should eliminate these kinds of bugs in the future.

While we're at it, rename the awkwardly titled "rand_initialize()" to
the more standard "random_init()" nomenclature.

Reviewed-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 9b4145d7cd2a312935131939f934fcfd53d24e87..f53e8a9820d81e9b72fba86f84764f5df5b75a93 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -883,12 +883,13 @@ early_param("random.trust_bootloader", parse_trust_bootloader);
 
 /*
  * The first collection of entropy occurs at system boot while interrupts
- * are still turned off. Here we push in RDSEED, a timestamp, and utsname().
- * Depending on the above configuration knob, RDSEED may be considered
- * sufficient for initialization. Note that much earlier setup may already
- * have pushed entropy into the input pool by the time we get here.
+ * are still turned off. Here we push in latent entropy, RDSEED, a timestamp,
+ * utsname(), and the command line. Depending on the above configuration knob,
+ * RDSEED may be considered sufficient for initialization. Note that much
+ * earlier setup may already have pushed entropy into the input pool by the
+ * time we get here.
  */
-int __init rand_initialize(void)
+int __init random_init(const char *command_line)
 {
        size_t i;
        ktime_t now = ktime_get_real();
@@ -910,6 +911,8 @@ int __init rand_initialize(void)
        }
        _mix_pool_bytes(&now, sizeof(now));
        _mix_pool_bytes(utsname(), sizeof(*(utsname())));
+       _mix_pool_bytes(command_line, strlen(command_line));
+       add_latent_entropy();
 
        if (crng_ready())
                crng_reseed();

diff --git a/include/linux/random.h b/include/linux/random.h
index d4abda9e23487274104b188f442a42ca04c59840..588e31dc10af3dec2e14887c5c4a344aa20233b2 100644 (file)
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -14,26 +14,24 @@ struct notifier_block;
 
 extern void add_device_randomness(const void *, size_t);
 extern void add_bootloader_randomness(const void *, size_t);
+extern void add_input_randomness(unsigned int type, unsigned int code,
+                                unsigned int value) __latent_entropy;
+extern void add_interrupt_randomness(int irq) __latent_entropy;
+extern void add_hwgenerator_randomness(const void *buffer, size_t count,
+                                      size_t entropy);
 
 #if defined(LATENT_ENTROPY_PLUGIN) && !defined(__CHECKER__)
 static inline void add_latent_entropy(void)
 {
-       add_device_randomness((const void *)&latent_entropy,
-                             sizeof(latent_entropy));
+       add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
 }
 #else
 static inline void add_latent_entropy(void) {}
 #endif
 
-extern void add_input_randomness(unsigned int type, unsigned int code,
-                                unsigned int value) __latent_entropy;
-extern void add_interrupt_randomness(int irq) __latent_entropy;
-extern void add_hwgenerator_randomness(const void *buffer, size_t count,
-                                      size_t entropy);
-
 extern void get_random_bytes(void *buf, size_t nbytes);
 extern int wait_for_random_bytes(void);
-extern int __init rand_initialize(void);
+extern int __init random_init(const char *command_line);
 extern bool rng_is_initialized(void);
 extern int register_random_ready_notifier(struct notifier_block *nb);
 extern int unregister_random_ready_notifier(struct notifier_block *nb);

diff --git a/init/main.c b/init/main.c
index cb18c6d7b55288ba76e07fb8ae4ac94e4a0c6f40..bf27f802d0a13a402b8693b4a644df805df4d7c9 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -612,15 +612,11 @@ asmlinkage __visible void __init start_kernel(void)
        /*
         * 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()
+        * - timekeeping_init() for ktime entropy used in random_init()
         * - 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
+        * - random_init() to initialize the RNG from from early entropy sources
         */
-       rand_initialize();
-       add_latent_entropy();
-       add_device_randomness(command_line, strlen(command_line));
+       random_init(command_line);
        boot_init_stack_canary();
 
        sched_clock_postinit();