Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e344048 authored by Kees Cook's avatar Kees Cook Committed by Russell King
Browse files

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



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: default avatarKees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent 32b14363

arch/arm/lib/getuser.S

+1 −1
Original line number Diff line number Diff line
@@ -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]