Mix in randomness from hw-rng sources more frequently during early
boot, approximately once for every rng reseed.
Cc: Jason A. Donenfeld <Jason@xxxxxxxxx>
Cc: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Dominik Brodowski <linux@xxxxxxxxxxxxxxxxxxxx>
---
This patch is currently based on
[PATCH] random / hw_random: core: start hwrng kthread also for untrusted sources
Jason, if you prefer that this patch can be applied first (as it
makes sense also independently of the other patch), this ordering
should be trivial to change.
drivers/char/random.c | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/drivers/char/random.c b/drivers/char/random.c
index b360ed4ece03..5559351f1259 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -260,25 +260,35 @@ static void crng_fast_key_erasure(u8 key[CHACHA_KEY_SIZE],
}
/*
- * Return whether the crng seed is considered to be sufficiently old
- * that a reseeding is needed. This happens if the last reseeding
- * was CRNG_RESEED_INTERVAL ago, or during early boot, at an interval
- * proportional to the uptime.
+ * Return the interval to the next regular reseed of the crng. This
+ * equals CRNG_RESEED_INTERVAL, or during early boot, an interval
+ * proportional to the uptime,
*/
-static bool crng_has_old_seed(void)
+static unsigned int crng_interval(void)
{
static bool early_boot = true;
- unsigned long interval = CRNG_RESEED_INTERVAL;
if (unlikely(READ_ONCE(early_boot))) {
time64_t uptime = ktime_get_seconds();
if (uptime >= CRNG_RESEED_INTERVAL / HZ * 2)
WRITE_ONCE(early_boot, false);
else
- interval = max_t(unsigned int, CRNG_RESEED_START_INTERVAL,
- (unsigned int)uptime / 2 * HZ);
+ return max_t(unsigned int, CRNG_RESEED_START_INTERVAL,
+ (unsigned int)uptime / 2 * HZ);
}
- return time_is_before_jiffies(READ_ONCE(base_crng.birth) + interval);
+
+ return CRNG_RESEED_INTERVAL;
+}
+
+/*
+ * Return whether the crng seed is considered to be sufficiently old
+ * that a reseeding is needed. This happens if the last reseeding
+ * was CRNG_RESEED_INTERVAL ago, or during early boot, at an interval
+ * proportional to the uptime.
+ */
+static bool crng_has_old_seed(void)
+{
+ return time_is_before_jiffies(READ_ONCE(base_crng.birth) + crng_interval());
}
/*
@@ -866,11 +876,11 @@ void add_hwgenerator_randomness(const void *buf, size_t len, size_t entropy)
credit_init_bits(entropy);
/*
- * Throttle writing to once every CRNG_RESEED_INTERVAL, unless
+ * Throttle writing to once every reseed interval, unless
* we're not yet initialized or this source isn't trusted.
*/
if (!kthread_should_stop() && (crng_ready() || !entropy))
- schedule_timeout_interruptible(CRNG_RESEED_INTERVAL);
+ schedule_timeout_interruptible(crng_interval());
}
EXPORT_SYMBOL_GPL(add_hwgenerator_randomness);
--
2.37.3
