From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id E53663854811; Wed, 26 Oct 2022 14:48:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E53663854811 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666795739; bh=lgV1915WB1ONqRY//+JSuDx/s/BXnsln8MEOTerZVAA=; h=From:To:Subject:Date:From; b=c14BXdOjD9OPvqfrJKJtI6wOgkubmDYqakLsJLD3HIuD/wzl0/eHirgsG1loD9QLi pMVOGkJauw/OUVDeVG5q03e2MVuZYOkJVX7qz0kN2cJEDyufLxclsGdexwMvyY7IIE zJP4aYilRGoERSoSuN63Nhb08KSjJ4c413sowkUA= 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] TODO(uapi): mmap perm emulation X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 28f19db3b85abd039734b55b29acc22897b88302 X-Git-Newrev: dac0b184e7affbcdb11c3bfaef7d03bf3b0bfe28 Message-Id: <20221026144859.E53663854811@sourceware.org> Date: Wed, 26 Oct 2022 14:48:58 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=dac0b184e7affbcdb11c3bfaef7d03bf3b0bfe28 commit dac0b184e7affbcdb11c3bfaef7d03bf3b0bfe28 Author: Szabolcs Nagy Date: Mon Oct 24 15:29:58 2022 +0100 TODO(uapi): mmap perm emulation Diff: --- sysdeps/unix/sysv/linux/mmap64.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sysdeps/unix/sysv/linux/mmap64.c b/sysdeps/unix/sysv/linux/mmap64.c index 60da02939d..a7bd396880 100644 --- a/sysdeps/unix/sysv/linux/mmap64.c +++ b/sysdeps/unix/sysv/linux/mmap64.c @@ -22,6 +22,9 @@ #include #include #include +#ifdef __CHERI_PURE_CAPABILITY__ +# include +#endif #ifdef __NR_mmap2 /* To avoid silent truncation of offset when using mmap2, do not accept @@ -64,6 +67,20 @@ __mmap64 (void *addr, size_t len, int prot, int flags, int fd, off64_t offset) { size_t ps = GLRO(dl_pagesize); ret = __builtin_cheri_bounds_set (ret, (len + ps - 1) & -ps); + unsigned long mask = CAP_PERM_MASK_BASE; + if (prot & PROT_READ) + mask |= CAP_PERM_MASK_R; + if (prot & PROT_WRITE) + mask |= CAP_PERM_MASK_RW; + if (prot & PROT_EXEC) + mask |= CAP_PERM_MASK_RX; + if (prot & PROT_MAX (PROT_READ)) + mask |= CAP_PERM_MASK_R; + if (prot & PROT_MAX (PROT_WRITE)) + mask |= CAP_PERM_MASK_RW; + if (prot & PROT_MAX (PROT_EXEC)) + mask |= CAP_PERM_MASK_RX; + ret = __builtin_cheri_perms_and (ret, mask); } #endif return ret;