diff options
| author | Will Deacon <will.deacon@arm.com> | 2017-08-10 13:58:16 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2017-12-11 13:40:35 +0000 |
| commit | 27a921e75711d924617269e0ba4adb8bae9fd0d1 (patch) | |
| tree | bb4db9089fb6bb5606197222704a7522d2c9b2c6 /arch/arm64/lib/copy_from_user.S | |
| parent | 158d495899ce55db453f682a8ac8390d5a426578 (diff) | |
| download | lwn-27a921e75711d924617269e0ba4adb8bae9fd0d1.tar.gz lwn-27a921e75711d924617269e0ba4adb8bae9fd0d1.zip | |
arm64: mm: Fix and re-enable ARM64_SW_TTBR0_PAN
With the ASID now installed in TTBR1, we can re-enable ARM64_SW_TTBR0_PAN
by ensuring that we switch to a reserved ASID of zero when disabling
user access and restore the active user ASID on the uaccess enable path.
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Laura Abbott <labbott@redhat.com>
Tested-by: Shanker Donthineni <shankerd@codeaurora.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/lib/copy_from_user.S')
| -rw-r--r-- | arch/arm64/lib/copy_from_user.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/lib/copy_from_user.S b/arch/arm64/lib/copy_from_user.S index 4b5d826895ff..69d86a80f3e2 100644 --- a/arch/arm64/lib/copy_from_user.S +++ b/arch/arm64/lib/copy_from_user.S @@ -64,7 +64,7 @@ end .req x5 ENTRY(__arch_copy_from_user) - uaccess_enable_not_uao x3, x4 + uaccess_enable_not_uao x3, x4, x5 add end, x0, x2 #include "copy_template.S" uaccess_disable_not_uao x3 |