diff options
| author | Marc Zyngier | 2016-12-12 14:50:26 +0100 |
|---|---|---|
| committer | Catalin Marinas | 2016-12-12 18:52:27 +0100 |
| commit | 75037120e62b58c536999eb23d70cfcb6d6c0bcc (patch) | |
| tree | 5fe10ee846ba9d7e5c61b1ea7ce0fc2fac83d793 /arch/arm64/include/asm/uaccess.h | |
| parent | arm64: Work around broken .inst when defective gas is detected (diff) | |
| download | kernel-qcow2-linux-75037120e62b58c536999eb23d70cfcb6d6c0bcc.tar.gz kernel-qcow2-linux-75037120e62b58c536999eb23d70cfcb6d6c0bcc.tar.xz kernel-qcow2-linux-75037120e62b58c536999eb23d70cfcb6d6c0bcc.zip | |
arm64: Disable PAN on uaccess_enable()
Commit 4b65a5db3627 ("arm64: Introduce uaccess_{disable,enable}
functionality based on TTBR0_EL1") added conditional user access
enable/disable. Unfortunately, a typo prevents the PAN bit from being
cleared for user access functions.
Restore the PAN functionality by adding the missing '!'.
Fixes: b65a5db3627 ("arm64: Introduce uaccess_{disable,enable} functionality based on TTBR0_EL1")
Reported-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/uaccess.h')
| -rw-r--r-- | arch/arm64/include/asm/uaccess.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h index 6986f56cfa88..d26750ca6e06 100644 --- a/arch/arm64/include/asm/uaccess.h +++ b/arch/arm64/include/asm/uaccess.h @@ -188,7 +188,7 @@ do { \ #define __uaccess_enable(alt) \ do { \ - if (uaccess_ttbr0_enable()) \ + if (!uaccess_ttbr0_enable()) \ asm(ALTERNATIVE("nop", SET_PSTATE_PAN(0), alt, \ CONFIG_ARM64_PAN)); \ } while (0) |