Skip to content

Commit 4e8c11b

Browse files
yuliao0214KAGA-KOKO
authored andcommitted
timekeeping: Really make sure wall_to_monotonic isn't positive
Even after commit e1d7ba8 ("time: Always make sure wall_to_monotonic isn't positive") it is still possible to make wall_to_monotonic positive by running the following code: int main(void) { struct timespec time; clock_gettime(CLOCK_MONOTONIC, &time); time.tv_nsec = 0; clock_settime(CLOCK_REALTIME, &time); return 0; } The reason is that the second parameter of timespec64_compare(), ts_delta, may be unnormalized because the delta is calculated with an open coded substraction which causes the comparison of tv_sec to yield the wrong result: wall_to_monotonic = { .tv_sec = -10, .tv_nsec = 900000000 } ts_delta = { .tv_sec = -9, .tv_nsec = -900000000 } That makes timespec64_compare() claim that wall_to_monotonic < ts_delta, but actually the result should be wall_to_monotonic > ts_delta. After normalization, the result of timespec64_compare() is correct because the tv_sec comparison is not longer misleading: wall_to_monotonic = { .tv_sec = -10, .tv_nsec = 900000000 } ts_delta = { .tv_sec = -10, .tv_nsec = 100000000 } Use timespec64_sub() to ensure that ts_delta is normalized, which fixes the issue. Fixes: e1d7ba8 ("time: Always make sure wall_to_monotonic isn't positive") Signed-off-by: Yu Liao <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected]
1 parent 2585cf9 commit 4e8c11b

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

kernel/time/timekeeping.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1306,8 +1306,7 @@ int do_settimeofday64(const struct timespec64 *ts)
13061306
timekeeping_forward_now(tk);
13071307

13081308
xt = tk_xtime(tk);
1309-
ts_delta.tv_sec = ts->tv_sec - xt.tv_sec;
1310-
ts_delta.tv_nsec = ts->tv_nsec - xt.tv_nsec;
1309+
ts_delta = timespec64_sub(*ts, xt);
13111310

13121311
if (timespec64_compare(&tk->wall_to_monotonic, &ts_delta) > 0) {
13131312
ret = -EINVAL;

0 commit comments

Comments
 (0)