Commit 6787d3ec authored Feb 16, 2017 by Kees Cook Committed by Greg Kroah-Hartman Feb 23, 2017

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>

parent e6394c7d

arch/arm/lib/getuser.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -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]