Skip to content

Commit

Permalink
ARM: 8658/1: uaccess: fix zeroing of 64-bit get_user()
Browse files Browse the repository at this point in the history
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 <keescook@chromium.org>
Cc: stable@vger.kernel.org
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  • Loading branch information
Kees Cook authored and Russell King committed Feb 16, 2017
1 parent 32b1436 commit 9e34404
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/lib/getuser.S
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit 9e34404

Please sign in to comment.