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

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

random: do not use batches when !crng_ready() 



commit cbe89e5a375a51bbb952929b93fa973416fea74e upstream.

It's too hard to keep the batches synchronized, and pointless anyway,
since in !crng_ready(), we're updating the base_crng key really often,
where batching only hurts. So instead, if the crng isn't ready, just
call into get_random_bytes(). At this stage nothing is performance
critical anyhow.

Cc: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e247ea8d

drivers/char/random.c

+11 −3
Original line number Diff line number Diff line
@@ -465,11 +465,9 @@ static void crng_pre_init_inject(const void *input, size_t len, bool account) 


	if (account) {

		crng_init_cnt += min_t(size_t, len, CRNG_INIT_CNT_THRESH - crng_init_cnt);

		if (crng_init_cnt >= CRNG_INIT_CNT_THRESH) {

			++base_crng.generation;

		if (crng_init_cnt >= CRNG_INIT_CNT_THRESH)

			crng_init = 1;

	}

	}



	spin_unlock_irqrestore(&base_crng.lock, flags);
@@ -622,6 +620,11 @@ u64 get_random_u64(void) 


	warn_unseeded_randomness(&previous);



	if  (!crng_ready()) {

		_get_random_bytes(&ret, sizeof(ret));

		return ret;

	}



	local_irq_save(flags);

	batch = raw_cpu_ptr(&batched_entropy_u64);
@@ -655,6 +658,11 @@ u32 get_random_u32(void) 


	warn_unseeded_randomness(&previous);



	if  (!crng_ready()) {

		_get_random_bytes(&ret, sizeof(ret));

		return ret;

	}



	local_irq_save(flags);

	batch = raw_cpu_ptr(&batched_entropy_u32);