diff options
author | Will Deacon <will.deacon@arm.com> | 2018-02-05 18:34:23 +0300 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2018-02-07 01:53:40 +0300 |
commit | f71c2ffcb20dd8626880747557014bb9a61eb90e (patch) | |
tree | 9142a5c0744c32676ca16219edcff5e807dbf314 /arch/arm64/lib/copy_in_user.S | |
parent | 84624087dd7e3b482b7b11c170ebc1f329b3a218 (diff) | |
download | linux-f71c2ffcb20dd8626880747557014bb9a61eb90e.tar.xz |
arm64: uaccess: Mask __user pointers for __arch_{clear, copy_*}_user
Like we've done for get_user and put_user, ensure that user pointers
are masked before invoking the underlying __arch_{clear,copy_*}_user
operations.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/lib/copy_in_user.S')
-rw-r--r-- | arch/arm64/lib/copy_in_user.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm64/lib/copy_in_user.S b/arch/arm64/lib/copy_in_user.S index fbb090f431a5..54b75deb1d16 100644 --- a/arch/arm64/lib/copy_in_user.S +++ b/arch/arm64/lib/copy_in_user.S @@ -64,14 +64,15 @@ .endm end .req x5 -ENTRY(raw_copy_in_user) + +ENTRY(__arch_copy_in_user) uaccess_enable_not_uao x3, x4, x5 add end, x0, x2 #include "copy_template.S" uaccess_disable_not_uao x3, x4 mov x0, #0 ret -ENDPROC(raw_copy_in_user) +ENDPROC(__arch_copy_in_user) .section .fixup,"ax" .align 2 |