Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

hwrng: core - Don't use a stack buffer in add_early_randomness()

Browse source 
commit 6d4952d9d9d4dc2bb9c0255d95a09405a1e958f7 upstream.

hw_random carefully avoids using a stack buffer except in
add_early_randomness().  This causes a crash in virtio_rng if
CONFIG_VMAP_STACK=y.

Reported-by: Matt Mullins <mmullins@mmlx.us>
Tested-by: Matt Mullins <mmullins@mmlx.us>
Fixes: d3cc799647 ("hwrng: fetch randomness only after device init")
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Change-Id: I4b47fc4e5a5623ffe3538c8872784e8f0ae30fd2
This commit is contained in:
Andrew Lutomirski 2016-10-17 10:06:27 -07:00 committed by followmsi
parent ffe6845842
commit 47d838042a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/char/hw_random/core.c
View file

@ -74,12 +74,12 @@ static size_t rng_buffer_size(void)
static void add_early_randomness(struct hwrng *rng) static void add_early_randomness(struct hwrng *rng)
{ {
unsigned char bytes[16];
int bytes_read; int bytes_read;
size_t size = min_t(size_t, 16, rng_buffer_size());
bytes_read = rng_get_data(rng, bytes, sizeof(bytes), 0); bytes_read = rng_get_data(rng, rng_buffer, size, 1);
if (bytes_read > 0) if (bytes_read > 0)
add_device_randomness(bytes, bytes_read); add_device_randomness(rng_buffer, bytes_read);
} }
static inline int hwrng_init(struct hwrng *rng) static inline int hwrng_init(struct hwrng *rng)