Merge branch 'x86/rdrand' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86/rdrand' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: random: Adjust the number of loops when initializing random: Use arch-specific RNG to initialize the entropy store
This commit is contained in:
commit
c2bc3a316a
|
@ -965,6 +965,7 @@ EXPORT_SYMBOL(get_random_bytes);
|
|||
*/
|
||||
static void init_std_data(struct entropy_store *r)
|
||||
{
|
||||
int i;
|
||||
ktime_t now;
|
||||
unsigned long flags;
|
||||
|
||||
|
@ -974,6 +975,11 @@ static void init_std_data(struct entropy_store *r)
|
|||
|
||||
now = ktime_get_real();
|
||||
mix_pool_bytes(r, &now, sizeof(now));
|
||||
for (i = r->poolinfo->POOLBYTES; i > 0; i -= sizeof flags) {
|
||||
if (!arch_get_random_long(&flags))
|
||||
break;
|
||||
mix_pool_bytes(r, &flags, sizeof(flags));
|
||||
}
|
||||
mix_pool_bytes(r, utsname(), sizeof(*(utsname())));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue