Skip to content

Commit 584f548

Browse files
keesLee Jones
authored and
Lee Jones
committed
ARM: 8658/1: uaccess: fix zeroing of 64-bit get_user()
commit 9e3440481845b2ec22508f60837ee2cab2b6054f upstream. The 64-bit get_user() wasn't clearing the high word due to a typo in the error handler. The exception handler entry was already correct, though. Noticed during recent usercopy test additions in lib/test_user_copy.c. Signed-off-by: Kees Cook <[email protected]> Signed-off-by: Russell King <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Lee Jones <[email protected]> Change-Id: Ic1c7ea041c4d554f6de68feb448ae3c7cdc92990
1 parent f401837 commit 584f548

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/arm/lib/getuser.S

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ ENDPROC(__get_user_4)
7070
_ASM_NOKPROBE(__get_user_4)
7171

7272
ENTRY(__get_user_8)
73-
check_uaccess r0, 8, r1, r2, __get_user_bad
73+
check_uaccess r0, 8, r1, r2, __get_user_bad8
7474
#ifdef CONFIG_THUMB2_KERNEL
7575
5: TUSER(ldr) r2, [r0]
7676
6: TUSER(ldr) r3, [r0, #4]

0 commit comments

Comments
 (0)