aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-02-16 01:44:37 +0100
committerSasha Levin <alexander.levin@verizon.com>2017-03-06 17:31:14 -0500
commit55f14c685b8d5ca0e5954ecdc6101c3fef8365c1 (patch)
tree45e430eae1a6da2fc9ca0bb3248aa923775a882b
parent5b207199843c139f9a4ee6dfc8377a602d18e936 (diff)
downloadlinux-linaro-stable-55f14c685b8d5ca0e5954ecdc6101c3fef8365c1.tar.gz
ARM: 8658/1: uaccess: fix zeroing of 64-bit get_user()
[ Upstream commit 9e3440481845b2ec22508f60837ee2cab2b6054f ] 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> Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
-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]