m68k: use fallback for random_get_entropy() instead of zero
authorJason A. Donenfeld <Jason@zx2c4.com>
Fri, 8 Apr 2022 16:03:13 +0000 (18:03 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 25 Jun 2022 09:46:38 +0000 (11:46 +0200)
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>
arch/m68k/include/asm/timex.h

index 6a21d93582805540bdaba6b7699c157a9f73cc31..f4a7a340f4cae6da2e5738ca1c15746976f12cc1 100644 (file)
@@ -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