mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
timekeeping: Refresh auxiliary base before offset validation
timekeeping_forward_now() can advance an auxiliary timekeeper across a
second boundary without refreshing tkr_mono.base. The negative-time
check in __timekeeping_inject_offset() then uses the stale base and
rejects valid ADJ_SETOFFSET adjustments with -EINVAL.
Refresh the derived timekeeper data before calculating the current
auxiliary time, as aux_clock_set() already does.
On 7.4-rc1, a valid negative adjustment fails at the first second
rollover. The patched kernel accepts all 12 tested rollover adjustments
and continues to reject invalid negative offsets.
Fixes: 2c8aea59c2 ("timekeeping: Add auxiliary clock support to __timekeeping_inject_offset()")
Signed-off-by: Avi Weiss <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Cc: [email protected]
Link: https://patch.msgid.link/[email protected]
This commit is contained in:
committed by
Thomas Gleixner
parent
67f1969e29
commit
c1b96ba87e
@@ -1778,6 +1778,7 @@ static int __timekeeping_inject_offset(struct tk_data *tkd, const struct timespe
|
||||
struct tk_read_base *tkr_mono = &tks->tkr_mono;
|
||||
ktime_t now, offs;
|
||||
|
||||
tk_update_ktime_data(tks);
|
||||
/* Get the current time */
|
||||
now = ktime_add_ns(tkr_mono->base, timekeeping_get_ns(tkr_mono));
|
||||
/* Add the relative offset change */
|
||||
|
||||
Reference in New Issue
Block a user