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

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

random: do not take pool spinlock at boot 



commit afba0b80b977b2a8f16234f2acd982f82710ba33 upstream.

Since rand_initialize() is run while interrupts are still off and
nothing else is running, we don't need to repeatedly take and release
the pool spinlock, especially in the RDSEED loop.

Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
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 4c22f2c5

drivers/char/random.c

+3 −3
Original line number Diff line number Diff line
@@ -974,10 +974,10 @@ int __init rand_initialize(void) 
			rv = random_get_entropy();

			arch_init = false;

		}

		mix_pool_bytes(&rv, sizeof(rv));

		_mix_pool_bytes(&rv, sizeof(rv));

	}

	mix_pool_bytes(&now, sizeof(now));

	mix_pool_bytes(utsname(), sizeof(*(utsname())));

	_mix_pool_bytes(&now, sizeof(now));

	_mix_pool_bytes(utsname(), sizeof(*(utsname())));



	extract_entropy(base_crng.key, sizeof(base_crng.key));

	++base_crng.generation;