diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2018-07-09 10:13:36 +0100 |
---|---|---|
committer | Tao Huang <huangtao@rock-chips.com> | 2018-12-12 11:05:36 +0800 |
commit | e64f679fe389bdefb70e05109646b0ecf6d2d7d6 (patch) | |
tree | dbaba3dcd29de8469eda88fb4eb7de4e6e4077cf /arch/arm/include | |
parent | 607844100feb94b88d4a4719243e63d2aa90b451 (diff) |
UPSTREAM: ARM: vfp: use __copy_from_user() when restoring VFP state
__get_user_error() is used as a fast accessor to make copying structure
members in the signal handling path as efficient as possible. However,
with software PAN and the recent Spectre variant 1, the efficiency is
reduced as these are no longer fast accessors.
In the case of software PAN, it has to switch the domain register around
each access, and with Spectre variant 1, it would have to repeat the
access_ok() check for each access.
Use __copy_from_user() rather than __get_user_err() for individual
members when restoring VFP state.
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
(cherry picked from commit 42019fc50dfadb219f9e6ddf4c354f3837057d80)
Change-Id: I978369093e075213b01e27aff3c633acfb3592be
Diffstat (limited to 'arch/arm/include')
-rw-r--r-- | arch/arm/include/asm/thread_info.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h index af4a57fdc816..1888382fa6e2 100644 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm/thread_info.h @@ -133,8 +133,8 @@ struct user_vfp_exc; extern int vfp_preserve_user_clear_hwstate(struct user_vfp __user *, struct user_vfp_exc __user *); -extern int vfp_restore_user_hwstate(struct user_vfp __user *, - struct user_vfp_exc __user *); +extern int vfp_restore_user_hwstate(struct user_vfp *, + struct user_vfp_exc *); #endif /* |