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

Commit 0dd50d1b authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

random32: add prandom_seed_full_state helper 



Factor out the full reseed handling code that populates the state
through get_random_bytes() and runs prandom_warmup(). The resulting
prandom_seed_full_state() will be used later on in more than the
current __prandom_reseed() user. Fix also two minor whitespace
issues along the way.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c90aeb94

lib/random32.c

+21 −16
Original line number Diff line number Diff line
@@ -238,13 +238,30 @@ static void __init __prandom_start_seed_timer(void) 
	add_timer(&seed_timer);

}



static void prandom_seed_full_state(struct rnd_state __percpu *pcpu_state)

{

	int i;



	for_each_possible_cpu(i) {

		struct rnd_state *state = per_cpu_ptr(pcpu_state, i);

		u32 seeds[4];



		get_random_bytes(&seeds, sizeof(seeds));

		state->s1 = __seed(seeds[0],   2U);

		state->s2 = __seed(seeds[1],   8U);

		state->s3 = __seed(seeds[2],  16U);

		state->s4 = __seed(seeds[3], 128U);



		prandom_warmup(state);

	}

}



/*

 *	Generate better values after random number generator

 *	is fully initialized.

 */

static void __prandom_reseed(bool late)

{

	int i;

	unsigned long flags;

	static bool latch = false;

	static DEFINE_SPINLOCK(lock);
@@ -266,19 +283,7 @@ static void __prandom_reseed(bool late) 
		goto out;



	latch = true;



	for_each_possible_cpu(i) {

		struct rnd_state *state = &per_cpu(net_rand_state,i);

		u32 seeds[4];



		get_random_bytes(&seeds, sizeof(seeds));

		state->s1 = __seed(seeds[0],   2U);

		state->s2 = __seed(seeds[1],   8U);

		state->s3 = __seed(seeds[2],  16U);

		state->s4 = __seed(seeds[3], 128U);



		prandom_warmup(state);

	}

	prandom_seed_full_state(&net_rand_state);

out:

	spin_unlock_irqrestore(&lock, flags);

}