aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-02-16 01:44:37 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-02-23 17:43:09 +0100
commit6787d3ecbef743ef446d79ce1a1de1f9f4a7ff04 (patch)
treea73d05d5602b6e0b75de528d228a3cff01b521b8
parente6394c7d1c191005baa2d39ca2cc325374a7a35f (diff)
downloadlinux-linaro-stable-6787d3ecbef743ef446d79ce1a1de1f9f4a7ff04.tar.gz
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 <keescook@chromium.org> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/lib/getuser.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S
index 8ecfd15c3a02..df73914e81c8 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]