diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2022-06-13 10:07:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-14 18:45:20 +0200 |
| commit | 63aac575f5b00362517bde2dc21357d1be668b3a (patch) | |
| tree | 09106cd91a76938a0cbe887687c2f9e4a4a5c427 | |
| parent | 7764a258356c454fe56b9f56fc07c0e146a3bccb (diff) | |
| download | linux-63aac575f5b00362517bde2dc21357d1be668b3a.tar.gz linux-63aac575f5b00362517bde2dc21357d1be668b3a.tar.bz2 linux-63aac575f5b00362517bde2dc21357d1be668b3a.zip | |
random: avoid checking crng_ready() twice in random_init()
commit 9b29b6b20376ab64e1b043df6301d8a92378e631 upstream.
The current flow expands to:
if (crng_ready())
...
else if (...)
if (!crng_ready())
...
The second crng_ready() call is redundant, but can't so easily be
optimized out by the compiler.
This commit simplifies that to:
if (crng_ready()
...
else if (...)
...
Fixes: 560181c27b58 ("random: move initialization functions out of hot pages")
Cc: stable@vger.kernel.org
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/char/random.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index 0cfbfa8d5b50..79c61f38392e 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -842,7 +842,7 @@ int __init random_init(const char *command_line) if (crng_ready()) crng_reseed(); else if (trust_cpu) - credit_init_bits(arch_bytes * 8); + _credit_init_bits(arch_bytes * 8); return 0; } |