Commit 46cd5b22 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents c97481ab 602d60eb

lib/vdso/gettimeofday.c

+2 −3
Original line number Diff line number Diff line
@@ -248,11 +248,10 @@ bool do_aux(const struct vdso_time_data *vd, clockid_t clock, struct __kernel_ti 
	vc = &vd->aux_clock_data[idx];



	do {

		if (vdso_read_begin_timens(vc, &seq)) {

		while (vdso_read_begin_timens(vc, &seq)) {

			/* Re-read from the real time data page, reload seq by looping */

			vd = __arch_get_vdso_u_timens_data(vd);

			vc = &vd->aux_clock_data[idx];

			/* Re-read from the real time data page */

			continue;

		}



		/* Auxclock disabled? */