diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2022-09-23 02:42:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-10-15 08:02:55 +0200 |
| commit | f4f5b6cf3e1db05560a1f0d157d695401dd16804 (patch) | |
| tree | 82317e3be348d67c921dc72708fea22438671631 | |
| parent | a3dbb621eed976d4427a1ddd88967cc48d930987 (diff) | |
random: clamp credited irq bits to maximum mixed
commit e78a802a7b4febf53f2a92842f494b01062d85a8 upstream.
Since the most that's mixed into the pool is sizeof(long)*2, don't
credit more than that many bytes of entropy.
Fixes: e3e33fc2ea7f ("random: do not use input pool from hard IRQs")
Cc: stable@vger.kernel.org
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/char/random.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index c8cc23515568..030b0adbd4dd 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -1006,7 +1006,7 @@ static void mix_interrupt_randomness(struct work_struct *work) local_irq_enable(); mix_pool_bytes(pool, sizeof(pool)); - credit_init_bits(max(1u, (count & U16_MAX) / 64)); + credit_init_bits(clamp_t(unsigned int, (count & U16_MAX) / 64, 1, sizeof(pool) * 8)); memzero_explicit(pool, sizeof(pool)); } |