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 07:59:01 +0200 |
commit | 14f143fb42685bcc4400f6ef5c76f5e09b79193a (patch) | |
tree | 353b7ef8c6ac45cd74dca7a55e14ecb256d332a8 | |
parent | be53fa6cf667b9aac5ad64ba209ac9e14c610dee (diff) | |
download | linux-stable-14f143fb42685bcc4400f6ef5c76f5e09b79193a.tar.gz linux-stable-14f143fb42685bcc4400f6ef5c76f5e09b79193a.tar.bz2 linux-stable-14f143fb42685bcc4400f6ef5c76f5e09b79193a.zip |
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 50dc861f183b..5b2950473c19 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -980,7 +980,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)); } |