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: nptl: Fix thread stack capability permissions Date: Thu, 27 Oct 2022 13:56:13 +0000 (GMT) [thread overview] Message-ID: <20221027135613.A828D3851526@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c31913cc4121f13e1ef283bb8f82c1a9f21358f0 commit c31913cc4121f13e1ef283bb8f82c1a9f21358f0 Author: Szabolcs Nagy <szabolcs.nagy@arm.com> Date: Mon Oct 24 16:18:42 2022 +0100 cheri: nptl: Fix thread stack capability permissions Diff: --- nptl/allocatestack.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c index 219854f2cb..755ace5ec4 100644 --- a/nptl/allocatestack.c +++ b/nptl/allocatestack.c @@ -52,6 +52,13 @@ # define MAP_STACK 0 #endif +/* 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 + /* Get a stack frame from the cache. We have to match by size since some blocks might be too small or far too large. */ static struct pthread * @@ -363,7 +370,8 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp, /* If a guard page is required, avoid committing memory by first allocate with PROT_NONE and then reserve with required permission excluding the guard page. */ - mem = __mmap (NULL, size, (guardsize == 0) ? prot : PROT_NONE, + mem = __mmap (NULL, size, + (guardsize == 0) ? prot : PROT_NONE | PROT_MAX_RW, MAP_PRIVATE | MAP_ANONYMOUS | MAP_STACK, -1, 0); if (__glibc_unlikely (mem == MAP_FAILED))
next reply other threads:[~2022-10-27 13:56 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-10-27 13:56 Szabolcs Nagy [this message] -- strict thread matches above, loose matches on Subject: below -- 2022-11-23 14:46 Szabolcs Nagy 2022-10-26 15:17 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=20221027135613.A828D3851526@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).