Skip to content

Commit 46cd5b2

Browse files
committed
Merge tag 'timers-urgent-2026-05-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar: - Fix potential garbage reads in the vDSO gettimeofday code (Thomas Weißschuh) * tag 'timers-urgent-2026-05-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: vdso/gettimeofday: Reload sequence counter after switch to time page in do_aux()
2 parents c97481a + 602d60e commit 46cd5b2

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

lib/vdso/gettimeofday.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,10 @@ bool do_aux(const struct vdso_time_data *vd, clockid_t clock, struct __kernel_ti
248248
vc = &vd->aux_clock_data[idx];
249249

250250
do {
251-
if (vdso_read_begin_timens(vc, &seq)) {
251+
while (vdso_read_begin_timens(vc, &seq)) {
252+
/* Re-read from the real time data page, reload seq by looping */
252253
vd = __arch_get_vdso_u_timens_data(vd);
253254
vc = &vd->aux_clock_data[idx];
254-
/* Re-read from the real time data page */
255-
continue;
256255
}
257256

258257
/* Auxclock disabled? */

0 commit comments

Comments
 (0)