author: Dominik Brodowski <linux@dominikbrodowski.net> 2022-02-09 19:57:06 +0100
committer: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2022-05-30 09:27:05 +0200
commit: 432b6e6e60093ebeec6a3972a2fce1412418b6c8
parent: 06460c438d4aba1a5c8c3bb3164df60c91ea2586
Commit Summary:
Diffstat:
1 file changed, 6 insertions, 3 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 8ae7d0b30280..1ccd92efa8f4 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -502,6 +502,7 @@ static void crng_reseed(void)
int entropy_count;
unsigned long next_gen;
u8 key[CHACHA_KEY_SIZE];
+ bool finalize_init = false;
/*
* First we make sure we have POOL_MIN_BITS of entropy in the pool,
@@ -529,12 +530,14 @@ static void crng_reseed(void)
++next_gen;
WRITE_ONCE(base_crng.generation, next_gen);
WRITE_ONCE(base_crng.birth, jiffies);
- spin_unlock_irqrestore(&base_crng.lock, flags);
- memzero_explicit(key, sizeof(key));
-
if (crng_init < 2) {
invalidate_batched_entropy();
crng_init = 2;
+ finalize_init = true;
+ }
+ spin_unlock_irqrestore(&base_crng.lock, flags);
+ memzero_explicit(key, sizeof(key));
+ if (finalize_init) {
process_random_ready_list();
wake_up_interruptible(&crng_init_wait);
kill_fasync(&fasync, SIGIO, POLL_IN);