From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id A828D3851526; Thu, 27 Oct 2022 13:56:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A828D3851526 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666878973; bh=cufNS5W05zcb1kZU2cTIQ2X3DSo8sIBHzcmSLsRGumE=; h=From:To:Subject:Date:From; b=UhltQFrXBBvpxVB4xJnPe+JixMHcqt0DUUkbMdxDzYEohTRvxENARr9Ad+QJh3d2Z UqMk283oQddZiEy9gk33V8Ip6wtl22Kfc2e79RUVz9+jkNreMbSVWQ8OLC9XnIeZgz +oc3eHJp92Z9LgE0U5wUOclXI9e0+zOsFQy+R3fI= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: nptl: Fix thread stack capability permissions X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 835ba1822cb031f526ca95538d8c48f71bd3a718 X-Git-Newrev: c31913cc4121f13e1ef283bb8f82c1a9f21358f0 Message-Id: <20221027135613.A828D3851526@sourceware.org> Date: Thu, 27 Oct 2022 13:56:13 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c31913cc4121f13e1ef283bb8f82c1a9f21358f0 commit c31913cc4121f13e1ef283bb8f82c1a9f21358f0 Author: Szabolcs Nagy 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))