riscv: mm: Ensure prot of VM_WRITE and VM_EXEC must be readable
authorHsieh-Tseng Shen <woodrow.shen@sifive.com>
Tue, 25 Apr 2023 10:28:28 +0000 (18:28 +0800)
committerPalmer Dabbelt <palmer@rivosinc.com>
Wed, 7 Jun 2023 14:13:25 +0000 (07:13 -0700)
commit6569fc12e442ea973d96db39e542aa19a7bc3a79
treeb5ed8da61d4d5a08fd6aac4abc24575d643ec21a
parent6966d7988c4fb6af3e395868e9800c07f9e98a30
riscv: mm: Ensure prot of VM_WRITE and VM_EXEC must be readable

Commit 8aeb7b17f04e ("RISC-V: Make mmap() with PROT_WRITE imply PROT_READ")
allows riscv to use mmap with PROT_WRITE only, and meanwhile mmap with w+x
is also permitted. However, when userspace tries to access this page with
PROT_WRITE|PROT_EXEC, which causes infinite loop at load page fault as
well as it triggers soft lockup. According to riscv privileged spec,
"Writable pages must also be marked readable". The fix to drop the
`PAGE_COPY_READ_EXEC` and then `PAGE_COPY_EXEC` would be just used instead.
This aligns the other arches (i.e arm64) for protection_map.

Fixes: 8aeb7b17f04e ("RISC-V: Make mmap() with PROT_WRITE imply PROT_READ")
Signed-off-by: Hsieh-Tseng Shen <woodrow.shen@sifive.com>
Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/r/20230425102828.1616812-1-woodrow.shen@sifive.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
arch/riscv/include/asm/pgtable.h
arch/riscv/mm/init.c