Commit 1daf2f38 authored by Jason A. Donenfeld's avatar Jason A. Donenfeld
Browse files

random: check for crng_init == 0 in add_device_randomness()



This has no real functional change, as crng_pre_init_inject() (and
before that, crng_slow_init()) always checks for == 0, not >= 2. So
correct the outer unlocked change to reflect that. Before this used
crng_ready(), which was not correct.

Cc: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
parent da792c6d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ void add_device_randomness(const void *buf, size_t size)
	unsigned long time = random_get_entropy() ^ jiffies;
	unsigned long flags;

	if (!crng_ready() && size)
	if (crng_init == 0 && size)
		crng_pre_init_inject(buf, size, false, false);

	spin_lock_irqsave(&input_pool.lock, flags);