summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndrew Bresticker <abrestic@rivosinc.com>2022-09-15 15:37:01 -0400
committerPalmer Dabbelt <palmer@rivosinc.com>2022-09-22 09:44:50 -0700
commit7ab72c597356be1e7f0f3d856e54ce78527f43c8 (patch)
treec65d1600b224e02e67b6130f31b8d1559104ae87 /arch
parent568035b01cfb107af8d2e4bd2fb9aea22cf5b868 (diff)
downloadlinux-stable-7ab72c597356be1e7f0f3d856e54ce78527f43c8.tar.gz
linux-stable-7ab72c597356be1e7f0f3d856e54ce78527f43c8.tar.bz2
linux-stable-7ab72c597356be1e7f0f3d856e54ce78527f43c8.zip
riscv: Make VM_WRITE imply VM_READ
RISC-V does not presently have write-only mappings as that PTE bit pattern is considered reserved in the privileged spec, so allow handling of read faults in VMAs that have VM_WRITE without VM_READ in order to be consistent with other architectures that have similar limitations. Fixes: 2139619bcad7 ("riscv: mmap with PROT_WRITE but no PROT_READ is invalid") Reviewed-by: Atish Patra <atishp@rivosinc.com> Signed-off-by: Andrew Bresticker <abrestic@rivosinc.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20220915193702.2201018-2-abrestic@rivosinc.com/ Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/riscv/mm/fault.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c
index f2fbd1400b7c..d86f7cebd4a7 100644
--- a/arch/riscv/mm/fault.c
+++ b/arch/riscv/mm/fault.c
@@ -184,7 +184,8 @@ static inline bool access_error(unsigned long cause, struct vm_area_struct *vma)
}
break;
case EXC_LOAD_PAGE_FAULT:
- if (!(vma->vm_flags & VM_READ)) {
+ /* Write implies read */
+ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) {
return true;
}
break;