mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
timekeeping: contribute wall clock to rng on time change
[ Upstream commitb8ac29b401
] 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:1da177e4c3
("Linux-2.6.12-rc2") Cc: stable@vger.kernel.org Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
6b841a891d
commit
96ba981f09
1 changed files with 6 additions and 1 deletions
|
@ -23,6 +23,7 @@
|
||||||
#include <linux/pvclock_gtod.h>
|
#include <linux/pvclock_gtod.h>
|
||||||
#include <linux/compiler.h>
|
#include <linux/compiler.h>
|
||||||
#include <linux/audit.h>
|
#include <linux/audit.h>
|
||||||
|
#include <linux/random.h>
|
||||||
|
|
||||||
#include "tick-internal.h"
|
#include "tick-internal.h"
|
||||||
#include "ntp_internal.h"
|
#include "ntp_internal.h"
|
||||||
|
@ -1326,8 +1327,10 @@ int do_settimeofday64(const struct timespec64 *ts)
|
||||||
/* Signal hrtimers about time change */
|
/* Signal hrtimers about time change */
|
||||||
clock_was_set(CLOCK_SET_WALL);
|
clock_was_set(CLOCK_SET_WALL);
|
||||||
|
|
||||||
if (!ret)
|
if (!ret) {
|
||||||
audit_tk_injoffset(ts_delta);
|
audit_tk_injoffset(ts_delta);
|
||||||
|
add_device_randomness(ts, sizeof(*ts));
|
||||||
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -2413,6 +2416,7 @@ int do_adjtimex(struct __kernel_timex *txc)
|
||||||
ret = timekeeping_validate_timex(txc);
|
ret = timekeeping_validate_timex(txc);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
add_device_randomness(txc, sizeof(*txc));
|
||||||
|
|
||||||
if (txc->modes & ADJ_SETOFFSET) {
|
if (txc->modes & ADJ_SETOFFSET) {
|
||||||
struct timespec64 delta;
|
struct timespec64 delta;
|
||||||
|
@ -2430,6 +2434,7 @@ int do_adjtimex(struct __kernel_timex *txc)
|
||||||
audit_ntp_init(&ad);
|
audit_ntp_init(&ad);
|
||||||
|
|
||||||
ktime_get_real_ts64(&ts);
|
ktime_get_real_ts64(&ts);
|
||||||
|
add_device_randomness(&ts, sizeof(ts));
|
||||||
|
|
||||||
raw_spin_lock_irqsave(&timekeeper_lock, flags);
|
raw_spin_lock_irqsave(&timekeeper_lock, flags);
|
||||||
write_seqcount_begin(&tk_core.seq);
|
write_seqcount_begin(&tk_core.seq);
|
||||||
|
|
Loading…
Reference in a new issue