public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Szabolcs Nagy <nsz@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: Fix capability permissions of PROT_NONE map in locarchive Date: Wed, 26 Oct 2022 15:17:45 +0000 (GMT) [thread overview] Message-ID: <20221026151745.AB764384642B@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=76bb30167b4e28a44e61e94e9b2474dc939c8ab5 commit 76bb30167b4e28a44e61e94e9b2474dc939c8ab5 Author: Szabolcs Nagy <szabolcs.nagy@arm.com> Date: Tue Oct 25 11:20:48 2022 +0100 cheri: Fix capability permissions of PROT_NONE map in locarchive Diff: --- locale/programs/locarchive.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c index eeb2fa6ffe..81a980b60b 100644 --- a/locale/programs/locarchive.c +++ b/locale/programs/locarchive.c @@ -84,6 +84,13 @@ static const char *locnames[] = /* Size of the reserved address space area. */ #define RESERVE_MMAP_SIZE 512 * 1024 * 1024 +/* On CHERI targets ensure the mmap returned capability has RW permissions. */ +#ifdef PROT_MAX +# define PROT_MAX_RW PROT_MAX (PROT_READ | PROT_WRITE) +#else +# define PROT_MAX_RW 0 +#endif + /* To prepare for enlargements of the mmaped area reserve some address space. On some machines, being a file mapping rather than an anonymous mapping affects the address selection. So do this mapping from the @@ -94,7 +101,8 @@ prepare_address_space (int fd, size_t total, size_t *reserved, int *xflags, { if (total < RESERVE_MMAP_SIZE) { - void *p = mmap64 (NULL, RESERVE_MMAP_SIZE, PROT_NONE, MAP_SHARED, fd, 0); + void *p = mmap64 (NULL, RESERVE_MMAP_SIZE, + PROT_NONE | PROT_MAX_RW, MAP_SHARED, fd, 0); if (p != MAP_FAILED) { void *aligned_p = PTR_ALIGN_UP (p, MAP_FIXED_ALIGNMENT);
next reply other threads:[~2022-10-26 15:17 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-10-26 15:17 Szabolcs Nagy [this message] -- strict thread matches above, loose matches on Subject: below -- 2022-11-23 14:46 Szabolcs Nagy 2022-10-27 13:56 Szabolcs Nagy 2022-10-26 14:49 Szabolcs Nagy
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=20221026151745.AB764384642B@sourceware.org \ --to=nsz@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /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: linkBe 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 read-only IMAP folder(s) and NNTP newsgroup(s).