Commit 9fe68cad authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes a regression caused by the stack vmalloc change"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  hwrng: core - Don't use a stack buffer in add_early_randomness()
parents b5cd8917 6d4952d9
...@@ -84,14 +84,14 @@ static size_t rng_buffer_size(void) ...@@ -84,14 +84,14 @@ 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());
mutex_lock(&reading_mutex); mutex_lock(&reading_mutex);
bytes_read = rng_get_data(rng, bytes, sizeof(bytes), 1); bytes_read = rng_get_data(rng, rng_buffer, size, 1);
mutex_unlock(&reading_mutex); mutex_unlock(&reading_mutex);
if (bytes_read > 0) if (bytes_read > 0)
add_device_randomness(bytes, bytes_read); add_device_randomness(rng_buffer, bytes_read);
} }
static inline void cleanup_rng(struct kref *kref) static inline void cleanup_rng(struct kref *kref)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment