Re: [PATCH RESEND] random: fix the RNDRESEEDCRNG ioctl
From: Ard Biesheuvel <ardb@kernel.org>
Date: 2021-01-13 11:53:09
Also in:
lkml, stable
On Tue, 12 Jan 2021 at 20:30, Eric Biggers [off-list ref] wrote:
From: Eric Biggers <redacted>
The RNDRESEEDCRNG ioctl reseeds the primary_crng from itself, which
doesn't make sense. Reseed it from the input_pool instead.
Fixes: d848e5f8e1eb ("random: add new ioctl RNDRESEEDCRNG")
Cc: stable@vger.kernel.org
Cc: linux-crypto@vger.kernel.org
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Jann Horn <jannh@google.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jann Horn <jannh@google.com>
Signed-off-by: Eric Biggers <redacted>Acked-by: Ard Biesheuvel <ardb@kernel.org>
quoted hunk ↗ jump to hunk
--- Andrew, please consider taking this patch since the maintainer has been ignoring it for 4 months (https://lkml.kernel.org/lkml/20200916041908.66649-1-ebiggers@kernel.org/T/#u). drivers/char/random.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/drivers/char/random.c b/drivers/char/random.c index 5f3b8ac9d97b0..a894c0559a8cf 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c@@ -1972,7 +1972,7 @@ static long random_ioctl(struct file *f, unsigned int cmd, unsigned long arg) return -EPERM; if (crng_init < 2) return -ENODATA; - crng_reseed(&primary_crng, NULL); + crng_reseed(&primary_crng, &input_pool); crng_global_init_time = jiffies - 1; return 0; default: --2.30.0