BACKPORT: random32: add prandom_reseed_late() and call when nonblocking pool becomes initialized
Clean cherry pick of commit4af712e8df
. The Tausworthe PRNG is initialized at late_initcall time. At that time the entropy pool serving get_random_bytes is not filled sufficiently. This patch adds an additional reseeding step as soon as the nonblocking pool gets marked as initialized. On some machines it might be possible that late_initcall gets called after the pool has been initialized. In this situation we won't reseed again. (A call to prandom_seed_late blocks later invocations of early reseed attempts.) Joint work with Daniel Borkmann. Cc: Eric Dumazet <eric.dumazet@gmail.com> Cc: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: Daniel Borkmann <dborkman@redhat.com> Acked-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: David S. Miller <davem@davemloft.net> Bug: http://b/29621447 Change-Id: I4d20e60b5df16228f3a3699d16ed2b1dddcceb2b (cherry picked from commit4af712e8df
)
This commit is contained in:
parent
6e2e4a6cfc
commit
f959193531
|
@ -595,8 +595,11 @@ retry:
|
|||
|
||||
if (!r->initialized && nbits > 0) {
|
||||
r->entropy_total += nbits;
|
||||
if (r->entropy_total > 128)
|
||||
if (r->entropy_total > 128) {
|
||||
r->initialized = 1;
|
||||
if (r == &nonblocking_pool)
|
||||
prandom_reseed_late();
|
||||
}
|
||||
}
|
||||
|
||||
/* should we wake readers? */
|
||||
|
|
|
@ -67,6 +67,7 @@ unsigned long randomize_range(unsigned long start, unsigned long end, unsigned l
|
|||
u32 prandom_u32(void);
|
||||
void prandom_bytes(void *buf, int nbytes);
|
||||
void prandom_seed(u32 seed);
|
||||
void prandom_reseed_late(void);
|
||||
|
||||
/*
|
||||
* These macros are preserved for backward compatibility and should be
|
||||
|
|
|
@ -200,9 +200,18 @@ static void prandom_start_seed_timer(void)
|
|||
* Generate better values after random number generator
|
||||
* is fully initialized.
|
||||
*/
|
||||
static int __init prandom_reseed(void)
|
||||
static void __prandom_reseed(bool late)
|
||||
{
|
||||
int i;
|
||||
unsigned long flags;
|
||||
static bool latch = false;
|
||||
static DEFINE_SPINLOCK(lock);
|
||||
|
||||
/* only allow initial seeding (late == false) once */
|
||||
spin_lock_irqsave(&lock, flags);
|
||||
if (latch && !late)
|
||||
goto out;
|
||||
latch = true;
|
||||
|
||||
for_each_possible_cpu(i) {
|
||||
struct rnd_state *state = &per_cpu(net_rand_state,i);
|
||||
|
@ -216,6 +225,18 @@ static int __init prandom_reseed(void)
|
|||
/* mix it in */
|
||||
prandom_u32_state(state);
|
||||
}
|
||||
out:
|
||||
spin_unlock_irqrestore(&lock, flags);
|
||||
}
|
||||
|
||||
void prandom_reseed_late(void)
|
||||
{
|
||||
__prandom_reseed(true);
|
||||
}
|
||||
|
||||
static int __init prandom_reseed(void)
|
||||
{
|
||||
__prandom_reseed(false);
|
||||
prandom_start_seed_timer();
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue