提交 d6e087f8 编写于 作者: J Jason A. Donenfeld 提交者: Zheng Zengkai

m68k: use fallback for random_get_entropy() instead of zero

stable inclusion
from stable-v5.10.119
commit 84397906a60373e7764553788cd3d1f04b640f80
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5L6BB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=84397906a60373e7764553788cd3d1f04b640f80

--------------------------------

commit 0f392c95 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: NGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: NJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 fe46e019
...@@ -35,7 +35,7 @@ static inline unsigned long random_get_entropy(void) ...@@ -35,7 +35,7 @@ static inline unsigned long random_get_entropy(void)
{ {
if (mach_random_get_entropy) if (mach_random_get_entropy)
return mach_random_get_entropy(); return mach_random_get_entropy();
return 0; return random_get_entropy_fallback();
} }
#define random_get_entropy random_get_entropy #define random_get_entropy random_get_entropy
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册