diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2022-04-08 18:03:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-25 11:49:10 +0200 |
| commit | 0632f575ddec15d00e478761f87bd68fd0580964 (patch) | |
| tree | 42cd1300a823bfefaa7f8ed0afe0ac0665765f65 /arch/m68k | |
| parent | 8cea35e3a001fb5f465f83df49314f5e8d2cc7e8 (diff) | |
| download | linux-stable-0632f575ddec15d00e478761f87bd68fd0580964.tar.gz linux-stable-0632f575ddec15d00e478761f87bd68fd0580964.tar.bz2 linux-stable-0632f575ddec15d00e478761f87bd68fd0580964.zip | |
m68k: use fallback for random_get_entropy() instead of zero
commit 0f392c95391f2d708b12971a07edaa7973f9eece upstream.
In the event that random_get_entropy() can't access a cycle counter or
similar, falling back to returning 0 is really not the best we can do.
Instead, at least calling random_get_entropy_fallback() would be
preferable, because that always needs to return _something_, even
falling back to jiffies eventually. It's not as though
random_get_entropy_fallback() is super high precision or guaranteed to
be entropic, but basically anything that's not zero all the time is
better than returning zero all the time.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/include/asm/timex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/timex.h b/arch/m68k/include/asm/timex.h index 6a21d9358280..f4a7a340f4ca 100644 --- a/arch/m68k/include/asm/timex.h +++ b/arch/m68k/include/asm/timex.h @@ -35,7 +35,7 @@ static inline unsigned long random_get_entropy(void) { if (mach_random_get_entropy) return mach_random_get_entropy(); - return 0; + return random_get_entropy_fallback(); } #define random_get_entropy random_get_entropy |