]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
vdso/gettimeofday: Reload sequence counter after switch to time page in do_aux()
authorThomas Weißschuh <thomas.weissschuh@linutronix.de>
Wed, 22 Apr 2026 09:42:32 +0000 (11:42 +0200)
committerThomas Gleixner <tglx@kernel.org>
Thu, 14 May 2026 10:30:53 +0000 (12:30 +0200)
commit602d60ebae0f10bfbc7ba90eee026fdbd0203df3
tree630776a88be5c1c984d15c3d9fb852b1bffe4746
parent5d6919055dec134de3c40167a490f33c74c12581
vdso/gettimeofday: Reload sequence counter after switch to time page in do_aux()

After switching to the real data pages, the sequence counter needs to be
reloaded from there. The code using vdso_read_begin_timens() assumed
this worked by 'continue' jumping to the *beginning* of the do-while
retry loop. However the 'continue' jumps to the *end* of said loop,
evaluating the exit condition. If the data page has a sequence counter
of '1' it will match the one from the time namespace page and prematurely
exit the retry loop. This would result in garbage returned to the caller.

Reload the sequence counter after switching the pages by using an inner
while loop again, which will loop at most once.

The loop generates slightly better code than an explicit reload through
'seq = vdso_read_begin()'.

Fixes: ed78b7b2c5ae ("vdso/gettimeofday: Add a helper to read the sequence lock of a time namespace aware clock")
Reported-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Tested-by: Ricardo Ribalda <ribalda@chromium.org>
Reviewed-by: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
Link: https://patch.msgid.link/20260422-vdso-aux-timens-loop-v1-1-e2dd8c7164cc@linutronix.de
Closes: https://lore.kernel.org/lkml/CANiDSCsOy0P1if-gJZqOM5pTJ0RDcwVfru1B7KFbTOEMqjPKJw@mail.gmail.com/
lib/vdso/gettimeofday.c