ARM: 8658/1: uaccess: fix zeroing of 64-bit get_user()

9e344048 · Kees Cook <[email protected]> · 2017-02-16 01:44:37 +01:00

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]>
Cc: [email protected]
Signed-off-by: Russell King <[email protected]>

Commit: 9e3440481845b2ec22508f60837ee2cab2b6054f
Parents: 32b14363

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
arch/arm/lib/getuser.S	modified	+1	−1	View file

arch/arm/lib/getuser.S

View file

diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S
index 8ecfd15..df73914 100644
--- a/arch/arm/lib/getuser.S
+++ b/arch/arm/lib/getuser.S
@@ -67,7 +67,7 @@ ENTRY(__get_user_4)
 ENDPROC(__get_user_4)
 
 ENTRY(__get_user_8)
-	check_uaccess r0, 8, r1, r2, __get_user_bad
+	check_uaccess r0, 8, r1, r2, __get_user_bad8
 #ifdef CONFIG_THUMB2_KERNEL
 5: TUSER(ldr)	r2, [r0]
 6: TUSER(ldr)	r3, [r0, #4]