Commit dd54fd7d authored by Jason A. Donenfeld's avatar Jason A. Donenfeld
Browse files

random: use init_utsname() instead of utsname()



Rather than going through the current-> indirection for utsname, at this
point in boot, init_utsname()==utsname(), so just use it directly that
way. Additionally, init_utsname() appears to be available nearly always,
so move it into random_init_early().

Suggested-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
parent 08475dab
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -802,6 +802,7 @@ void __init random_init_early(const char *command_line)
		++i;
	}

	_mix_pool_bytes(init_utsname(), sizeof(*(init_utsname())));
	_mix_pool_bytes(command_line, strlen(command_line));

	/* Reseed if already seeded by earlier phases. */
@@ -820,7 +821,6 @@ void __init random_init(void)
	unsigned long entropy = random_get_entropy();
	ktime_t now = ktime_get_real();

	_mix_pool_bytes(utsname(), sizeof(*(utsname())));
	_mix_pool_bytes(&now, sizeof(now));
	_mix_pool_bytes(&entropy, sizeof(entropy));
	add_latent_entropy();