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: Kees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
This commit is contained in:
Kees Cook 2017-02-16 01:44:37 +01:00 committed by Russell King
parent 32b143637e
commit 9e34404818

View File

@ -67,7 +67,7 @@ ENTRY(__get_user_4)
ENDPROC(__get_user_4) ENDPROC(__get_user_4)
ENTRY(__get_user_8) 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 #ifdef CONFIG_THUMB2_KERNEL
5: TUSER(ldr) r2, [r0] 5: TUSER(ldr) r2, [r0]
6: TUSER(ldr) r3, [r0, #4] 6: TUSER(ldr) r3, [r0, #4]