linux-crypto.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] timekeeping: contribute wall clock to rng on time change
@ 2022-06-23 16:52 Jason A. Donenfeld
  2022-06-23 17:39 ` Eric Biggers
  2022-06-23 18:04 ` [PATCH] " kernel test robot
  0 siblings, 2 replies; 13+ messages in thread
From: Jason A. Donenfeld @ 2022-06-23 16:52 UTC (permalink / raw)
  To: LKML, Thomas Gleixner, linux-crypto; +Cc: Jason A. Donenfeld, stable

The rng's random_init() function contributes the real time to the rng at
boot time, so that events can at least start in relation to something
particular in the real world. But this clock might not yet be set that
point in boot, so nothing is contributed. In addition, the relation
between minor clock changes from, say, NTP, and the cycle counter is
potentially useful entropic data.

This commit addresses this by mixing in a time stamp on calls to
settimeofday and adjtimex. No entropy is credited in doing so, so it
doesn't make initialization faster, but it is still useful input to
have.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc: stable@vger.kernel.org
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 kernel/time/timekeeping.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 8e4b3c32fcf9..ad55da792f13 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -1346,6 +1346,9 @@ int do_settimeofday64(const struct timespec64 *ts)
 	if (!ret)
 		audit_tk_injoffset(ts_delta);
 
+	ktime_get_real_ts64(&xt);
+	add_device_randomness(&xt, sizeof(xt));
+
 	return ret;
 }
 EXPORT_SYMBOL(do_settimeofday64);
@@ -2475,6 +2478,9 @@ int do_adjtimex(struct __kernel_timex *txc)
 
 	ntp_notify_cmos_timer();
 
+	ktime_get_real_ts64(&ts);
+	add_device_randomness(&ts, sizeof(ts));
+
 	return ret;
 }
 
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2022-06-30 13:06 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-23 16:52 [PATCH] timekeeping: contribute wall clock to rng on time change Jason A. Donenfeld
2022-06-23 17:39 ` Eric Biggers
2022-06-23 18:04   ` Jason A. Donenfeld
2022-06-23 18:05     ` [PATCH v2] " Jason A. Donenfeld
2022-06-23 18:53       ` Eric Biggers
2022-06-23 18:56         ` Jason A. Donenfeld
2022-06-23 19:00           ` [PATCH v3] " Jason A. Donenfeld
2022-06-23 19:10             ` Eric Biggers
2022-06-23 19:11               ` Jason A. Donenfeld
2022-06-23 19:12                 ` [PATCH v4] " Jason A. Donenfeld
2022-06-23 19:36                   ` Eric Biggers
2022-06-30 13:06                     ` Jason A. Donenfeld
2022-06-23 18:04 ` [PATCH] " kernel test robot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).