Commit c80ed088 authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

arm64: vdso: fix clock_getres for 4GiB-aligned res



The vdso tries to check for a NULL res pointer in __kernel_clock_getres,
but only checks the lower 32 bits as is uses CBZ on the W register the
res pointer is held in.

Thus, if the res pointer happened to be aligned to a 4GiB boundary, we'd
spuriously skip storing the timespec to it, while returning a zero error code
to the caller.

Prevent this by checking the whole pointer, using CBZ on the X register
the res pointer is held in.

Fixes: 9031fefd ("arm64: VDSO support")
Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Reported-by: default avatarAndrew Pinski <apinski@cavium.com>
Reported-by: default avatarMark Salyzyn <salyzyn@android.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent fd9dde6a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ ENTRY(__kernel_clock_getres)
	b.ne	4f
	ldr	x2, 6f
2:
	cbz	w1, 3f
	cbz	x1, 3f
	stp	xzr, x2, [x1]

3:	/* res == NULL. */