From: Woodrow Shen <woodrow.shen@sifive.com>
To: Alexandre Ghiti <alexghiti@rivosinc.com>
Cc: paul.walmsley@sifive.com, palmer@dabbelt.com,
linux-riscv@lists.infradead.org, aou@eecs.berkeley.edu,
greentime.hu@sifive.com
Subject: Re: [RFC PATCH] riscv: mm: Ensure prot of VM_WRITE and VM_EXEC must be readable
Date: Tue, 25 Apr 2023 11:35:01 +0800 [thread overview]
Message-ID: <CABquHAQfL6stadEA6jUwOYLm9PDvpNw6V5fVLwVS43DsQL4kUw@mail.gmail.com> (raw)
In-Reply-To: <CAHVXubhW2=TQKYgaBFWeLKPcG4mgk08zk3kceK-53BdobE=Eeg@mail.gmail.com>
Hi Alexandre,
On Mon, Apr 24, 2023 at 3:47 PM Alexandre Ghiti <alexghiti@rivosinc.com> wrote:
>
> Hi Woodrow,
>
> On Fri, Apr 21, 2023 at 9:51 AM Woodrow Shen <woodrow.shen@sifive.com> wrote:
> >
> > From: Hsieh-Tseng Shen <woodrow.shen@sifive.com>
> >
> > The 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_EXEC` and then `PAGE_COPY_READ_EXEC` should 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>
> > ---
> > arch/riscv/include/asm/pgtable.h | 1 -
> > arch/riscv/mm/init.c | 2 +-
> > 2 files changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
> > index f641837ccf31..bb1e05367739 100644
> > --- a/arch/riscv/include/asm/pgtable.h
> > +++ b/arch/riscv/include/asm/pgtable.h
> > @@ -165,7 +165,6 @@ extern struct pt_alloc_ops pt_ops __initdata;
> > _PAGE_EXEC | _PAGE_WRITE)
> >
> > #define PAGE_COPY PAGE_READ
> > -#define PAGE_COPY_EXEC PAGE_EXEC
> > #define PAGE_COPY_READ_EXEC PAGE_READ_EXEC
> > #define PAGE_SHARED PAGE_WRITE
> > #define PAGE_SHARED_EXEC PAGE_WRITE_EXEC
> > diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
> > index 0f14f4a8d179..8b8c6ad85fdb 100644
> > --- a/arch/riscv/mm/init.c
> > +++ b/arch/riscv/mm/init.c
> > @@ -285,7 +285,7 @@ static const pgprot_t protection_map[16] = {
> > [VM_WRITE | VM_READ] = PAGE_COPY,
> > [VM_EXEC] = PAGE_EXEC,
> > [VM_EXEC | VM_READ] = PAGE_READ_EXEC,
> > - [VM_EXEC | VM_WRITE] = PAGE_COPY_EXEC,
> > + [VM_EXEC | VM_WRITE] = PAGE_COPY_READ_EXEC,
> > [VM_EXEC | VM_WRITE | VM_READ] = PAGE_COPY_READ_EXEC,
> > [VM_SHARED] = PAGE_NONE,
> > [VM_SHARED | VM_READ] = PAGE_READ,
> > --
> > 2.34.1
> >
>
> This looks sane, and it aligns the behaviour with VM_SHARED | VM_EXEC
> | VM_WRITE which implies read. One nit though: since PAGE_COPY_EXEC is
> not used anymore, I would rename PAGE_COPY_READ_EXEC into
> PAGE_COPY_EXEC and remove PAGE_COPY_READ_EXEC (so that PAGE_COPY_EXEC
> is the equivalent of PAGE_SHARED_EXEC).
>
> So you can add in your next version:
Thanks for the advice, I'll update the next version soon.
Woodrow
>
>
> Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com>
>
> Thanks!
>
> Alex
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
prev parent reply other threads:[~2023-04-25 3:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-21 7:51 [RFC PATCH] riscv: mm: Ensure prot of VM_WRITE and VM_EXEC must be readable Woodrow Shen
2023-04-24 7:46 ` Alexandre Ghiti
2023-04-25 3:35 ` Woodrow Shen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABquHAQfL6stadEA6jUwOYLm9PDvpNw6V5fVLwVS43DsQL4kUw@mail.gmail.com \
--to=woodrow.shen@sifive.com \
--cc=alexghiti@rivosinc.com \
--cc=aou@eecs.berkeley.edu \
--cc=greentime.hu@sifive.com \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).