[lkml]   [2018]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[PATCH 3.16 041/136] arm64: vdso: fix clock_getres for 4GiB-aligned res
3.16.54-rc1 review patch.  If anyone has any objections, please let me know.


From: Mark Rutland <>

commit c80ed088a519da53f27b798a69748eaabc66aadf upstream.

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: 9031fefde6f2ac1d ("arm64: VDSO support")
Signed-off-by: Mark Rutland <>
Reported-by: Andrew Pinski <>
Reported-by: Mark Salyzyn <>
Cc: Catalin Marinas <>
Cc: Will Deacon <>
Signed-off-by: Will Deacon <>
Signed-off-by: Ben Hutchings <>
arch/arm64/kernel/vdso/gettimeofday.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/arm64/kernel/vdso/gettimeofday.S
+++ b/arch/arm64/kernel/vdso/gettimeofday.S
@@ -186,7 +186,7 @@ ENTRY(__kernel_clock_getres) 4f
ldr x2, 6f
- cbz w1, 3f
+ cbz x1, 3f
stp xzr, x2, [x1]

3: /* res == NULL. */
 \ /
  Last update: 2018-02-11 05:39    [W:0.293 / U:0.248 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site