diff options
| author | Kees Cook <keescook@chromium.org> | 2017-02-15 19:44:37 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-02-16 10:58:32 -0500 |
| commit | 9e3440481845b2ec22508f60837ee2cab2b6054f (patch) | |
| tree | df1c9d3ad0d5713060661901654e970e420ee7c6 | |
| parent | 32b143637e8180f5d5cea54320c769210dea4f19 (diff) | |
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>
| -rw-r--r-- | arch/arm/lib/getuser.S | 2 |
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) | |||
| 67 | ENDPROC(__get_user_4) | 67 | ENDPROC(__get_user_4) |
| 68 | 68 | ||
| 69 | ENTRY(__get_user_8) | 69 | ENTRY(__get_user_8) |
| 70 | check_uaccess r0, 8, r1, r2, __get_user_bad | 70 | check_uaccess r0, 8, r1, r2, __get_user_bad8 |
| 71 | #ifdef CONFIG_THUMB2_KERNEL | 71 | #ifdef CONFIG_THUMB2_KERNEL |
| 72 | 5: TUSER(ldr) r2, [r0] | 72 | 5: TUSER(ldr) r2, [r0] |
| 73 | 6: TUSER(ldr) r3, [r0, #4] | 73 | 6: TUSER(ldr) r3, [r0, #4] |