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] TODO(uapi): narrow capability in mmap and mremap Date: Wed, 23 Nov 2022 14:43:51 +0000 (GMT) [thread overview] Message-ID: <20221123144351.30C213852C6C@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=655faf81b2b6e2a82eb3e811ca79ad9a09d430fa commit 655faf81b2b6e2a82eb3e811ca79ad9a09d430fa Author: Szabolcs Nagy <szabolcs.nagy@arm.com> Date: Fri Aug 5 11:44:57 2022 +0100 TODO(uapi): narrow capability in mmap and mremap This is a temporary workaround. length is rounded up to pagesize and don't use exact bound (bounds will be larger if exact value is not representable). capability permissions are roughly emulated too. TODO: kernel should do this Diff: --- sysdeps/unix/sysv/linux/mmap64.c | 31 +++++++++++++++++++++++++++++-- sysdeps/unix/sysv/linux/mremap.c | 12 +++++++++++- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/sysdeps/unix/sysv/linux/mmap64.c b/sysdeps/unix/sysv/linux/mmap64.c index 659dadadaf..a7bd396880 100644 --- a/sysdeps/unix/sysv/linux/mmap64.c +++ b/sysdeps/unix/sysv/linux/mmap64.c @@ -20,7 +20,11 @@ #include <unistd.h> #include <sys/mman.h> #include <sysdep.h> +#include <ldsodefs.h> #include <mmap_internal.h> +#ifdef __CHERI_PURE_CAPABILITY__ +# include <cheri_perms.h> +#endif #ifdef __NR_mmap2 /* To avoid silent truncation of offset when using mmap2, do not accept @@ -51,12 +55,35 @@ __mmap64 (void *addr, size_t len, int prot, int flags, int fd, off64_t offset) return (void *) INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL); MMAP_PREPARE (addr, len, prot, flags, fd, offset); + void *ret; #ifdef __NR_mmap2 - return (void *) MMAP_CALL (mmap2, addr, len, prot, flags, fd, + ret = (void *) MMAP_CALL (mmap2, addr, len, prot, flags, fd, (off_t) (offset / MMAP2_PAGE_UNIT)); #else - return (void *) MMAP_CALL (mmap, addr, len, prot, flags, fd, offset); + ret = (void *) MMAP_CALL (mmap, addr, len, prot, flags, fd, offset); +#endif +#ifdef __CHERI_PURE_CAPABILITY__ + if (ret != MAP_FAILED) + { + 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; } weak_alias (__mmap64, mmap64) libc_hidden_def (__mmap64) diff --git a/sysdeps/unix/sysv/linux/mremap.c b/sysdeps/unix/sysv/linux/mremap.c index e829a29dbd..2e89f43faa 100644 --- a/sysdeps/unix/sysv/linux/mremap.c +++ b/sysdeps/unix/sysv/linux/mremap.c @@ -20,6 +20,7 @@ #include <sysdep.h> #include <stdarg.h> #include <stddef.h> +#include <ldsodefs.h> void * __mremap (void *addr, size_t old_len, size_t new_len, int flags, ...) @@ -34,8 +35,17 @@ __mremap (void *addr, size_t old_len, size_t new_len, int flags, ...) va_end (va); } - return (void *) INLINE_SYSCALL_CALL (mremap, addr, old_len, new_len, flags, + void *ret; + ret = (void *) INLINE_SYSCALL_CALL (mremap, addr, old_len, new_len, flags, new_addr); +#ifdef __CHERI_PURE_CAPABILITY__ + if (ret != MAP_FAILED) + { + size_t ps = GLRO(dl_pagesize); + ret = __builtin_cheri_bounds_set (ret, (new_len + ps - 1) & -ps); + } +#endif + return ret; } libc_hidden_def (__mremap) weak_alias (__mremap, mremap)
next reply other threads:[~2022-11-23 14:43 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-11-23 14:43 Szabolcs Nagy [this message] -- strict thread matches above, loose matches on Subject: below -- 2022-10-27 13:53 Szabolcs Nagy 2022-10-26 15:15 Szabolcs Nagy 2022-10-12 14:16 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=20221123144351.30C213852C6C@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).