summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2022-02-28 13:57:57 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-06-25 11:49:07 +0200
commitfb413e95f02364612bb97c40ed8cd4d0945edcff (patch)
treee7ec10460de64afd136f57235a8ff9132b7ddf27 /drivers/char
parent2f8a4757ef4a5e93ae4b26d7734c0f78ffe7cfe3 (diff)
downloadlinux-stable-fb413e95f02364612bb97c40ed8cd4d0945edcff.tar.gz
linux-stable-fb413e95f02364612bb97c40ed8cd4d0945edcff.tar.bz2
linux-stable-fb413e95f02364612bb97c40ed8cd4d0945edcff.zip
random: give sysctl_random_min_urandom_seed a more sensible value
commit d0efdf35a6a71d307a250199af6fce122a7c7e11 upstream. This isn't used by anything or anywhere, but we can't delete it due to compatibility. So at least give it the correct value of what it's supposed to be instead of a garbage one. Cc: Theodore Ts'o <tytso@mit.edu> Reviewed-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/random.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 0976857834db..512f15162d59 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1612,7 +1612,7 @@ const struct file_operations urandom_fops = {
* to avoid breaking old userspaces, but writing to it does not
* change any behavior of the RNG.
*
- * - urandom_min_reseed_secs - fixed to the meaningless value "60".
+ * - urandom_min_reseed_secs - fixed to the value CRNG_RESEED_INTERVAL.
* It is writable to avoid breaking old userspaces, but writing
* to it does not change any behavior of the RNG.
*
@@ -1622,7 +1622,7 @@ const struct file_operations urandom_fops = {
#include <linux/sysctl.h>
-static int sysctl_random_min_urandom_seed = 60;
+static int sysctl_random_min_urandom_seed = CRNG_RESEED_INTERVAL / HZ;
static int sysctl_random_write_wakeup_bits = POOL_MIN_BITS;
static int sysctl_poolsize = POOL_BITS;
static u8 sysctl_bootid[UUID_SIZE];