Skip to content

Commit 6787d3e

Browse files
keesgregkh
authored andcommitted
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>
1 parent e6394c7 commit 6787d3e

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

arch/arm/lib/getuser.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ ENTRY(__get_user_4)
6767
ENDPROC(__get_user_4)
6868

6969
ENTRY(__get_user_8)
70-
check_uaccess r0, 8, r1, r2, __get_user_bad
70+
check_uaccess r0, 8, r1, r2, __get_user_bad8
7171
#ifdef CONFIG_THUMB2_KERNEL
7272
5: TUSER(ldr) r2, [r0]
7373
6: TUSER(ldr) r3, [r0, #4]

0 commit comments

Comments
 (0)