| Message ID | 20210112192818.69921-1-ebiggers@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | [RESEND] random: fix the RNDRESEEDCRNG ioctl | expand |
On Tue, 12 Jan 2021 at 20:30, Eric Biggers <ebiggers@kernel.org> wrote: > > From: Eric Biggers <ebiggers@google.com> > > 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 <ebiggers@google.com> Acked-by: Ard Biesheuvel <ardb@kernel.org> > --- > > 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 >
On Tue, Jan 12, 2021 at 11:28:18AM -0800, Eric Biggers wrote: > From: Eric Biggers <ebiggers@google.com> > > 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 <ebiggers@google.com> > --- > > 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). Ping.
On Mon, Feb 01, 2021 at 02:43:51PM -0800, Eric Biggers wrote: > On Tue, Jan 12, 2021 at 11:28:18AM -0800, Eric Biggers wrote: > > From: Eric Biggers <ebiggers@google.com> > > > > 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 <ebiggers@google.com> > > --- > > > > 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). > > Ping. Given the lack of response, I'll take this now... thanks, greg k-h
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: