Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
char
/
hw_random
/
core.c
diff --git
a/kernel/drivers/char/hw_random/core.c
b/kernel/drivers/char/hw_random/core.c
index
6f497aa
..
cf25020
100644
(file)
--- a/
kernel/drivers/char/hw_random/core.c
+++ b/
kernel/drivers/char/hw_random/core.c
@@
-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);
if (bytes_read > 0)
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)
}
static inline void cleanup_rng(struct kref *kref)