Commit e1fe1b10 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'timers_urgent_for_v5.16_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer fix from Borislav Petkov:

 - Make sure the CLOCK_REALTIME to CLOCK_MONOTONIC offset is never
   positive

* tag 'timers_urgent_for_v5.16_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timekeeping: Really make sure wall_to_monotonic isn't positive
parents 909e1d16 4e8c11b6

kernel/time/timekeeping.c

+1 −2
Original line number Diff line number Diff line
@@ -1306,8 +1306,7 @@ int do_settimeofday64(const struct timespec64 *ts) 
	timekeeping_forward_now(tk);



	xt = tk_xtime(tk);

	ts_delta.tv_sec = ts->tv_sec - xt.tv_sec;

	ts_delta.tv_nsec = ts->tv_nsec - xt.tv_nsec;

	ts_delta = timespec64_sub(*ts, xt);



	if (timespec64_compare(&tk->wall_to_monotonic, &ts_delta) > 0) {

		ret = -EINVAL;