Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/char/hw_random/core.c

+3 −3
Original line number Diff line number Diff line
@@ -84,14 +84,14 @@ static size_t rng_buffer_size(void) 


static void add_early_randomness(struct hwrng *rng)

{

	unsigned char bytes[16];

	int bytes_read;

	size_t size = min_t(size_t, 16, rng_buffer_size());



	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);

	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)