]> git.hungrycats.org Git - linux/commit
random: schedule jitter credit for next jiffy, not in two jiffies
authorJason A. Donenfeld <Jason@zx2c4.com>
Fri, 30 Sep 2022 22:31:00 +0000 (00:31 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Oct 2022 07:58:07 +0000 (09:58 +0200)
commitccc9abee86c5cf7e0a1805ec3fbab6c4566a2413
tree12cbaead748fa96a736c36e252f68b3871c61392
parent371fa5129af53a79f6dddc90fe5bb0825cbe72a4
random: schedule jitter credit for next jiffy, not in two jiffies

[ Upstream commit 122733471384be8c23f019fbbd46bdf7be561dcd ]

Counterintuitively, mod_timer(..., jiffies + 1) will cause the timer to
fire not in the next jiffy, but in two jiffies. The way to cause
the timer to fire in the next jiffy is with mod_timer(..., jiffies).
Doing so then lets us bump the upper bound back up again.

Fixes: 50ee7529ec45 ("random: try to actively add entropy rather than passively wait for it")
Fixes: 829d680e82a9 ("random: cap jitter samples per bit to factor of HZ")
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Sultan Alsawaf <sultan@kerneltoast.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/char/random.c