diff options
| author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-10-25 09:14:46 +0100 |
|---|---|---|
| committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-10-26 15:39:59 +0100 |
| commit | df30ef1b0d68ffde8dfb0a18ac08b97fe375d813 (patch) | |
| tree | 2b4513d48cf05dec8f5697d0a73122b32633b701 | |
| parent | cef9089a6894ed882a403a64c9949d7e08eedca8 (diff) | |
| download | glibc-df30ef1b0d68ffde8dfb0a18ac08b97fe375d813.tar glibc-df30ef1b0d68ffde8dfb0a18ac08b97fe375d813.tar.gz glibc-df30ef1b0d68ffde8dfb0a18ac08b97fe375d813.tar.bz2 glibc-df30ef1b0d68ffde8dfb0a18ac08b97fe375d813.zip | |
cheri: Fix capability permissions of PROT_NONE maps in test code
| -rw-r--r-- | support/blob_repeat.c | 2 | ||||
| -rw-r--r-- | support/support_stack_alloc.c | 2 | ||||
| -rw-r--r-- | support/xunistd.h | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/tst-pkey.c | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/support/blob_repeat.c b/support/blob_repeat.c index 2c952906ea..5e5fecac00 100644 --- a/support/blob_repeat.c +++ b/support/blob_repeat.c @@ -151,7 +151,7 @@ allocate_big (size_t total_size, const void *element, size_t element_size, /* Reserve the memory region. If we cannot create the mapping, there is no reason to set up the backing file. */ - void *target = mmap (NULL, total_size, PROT_NONE, + void *target = mmap (NULL, total_size, PROT_NONE | PROT_MAX_RW, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); if (target == MAP_FAILED) return (struct support_blob_repeat) { 0 }; diff --git a/support/support_stack_alloc.c b/support/support_stack_alloc.c index 77115fceb1..c138c0d4f9 100644 --- a/support/support_stack_alloc.c +++ b/support/support_stack_alloc.c @@ -60,7 +60,7 @@ support_stack_alloc (size_t size) so we know they are allocated. */ void *alloc_base = xmmap (0, alloc_size, - PROT_NONE, + PROT_NONE|PROT_MAX_RW, MAP_PRIVATE|MAP_ANONYMOUS|MAP_NORESERVE|MAP_STACK, -1); /* Some architecture still requires executable stack for the signal return diff --git a/support/xunistd.h b/support/xunistd.h index 960a62d412..2429424443 100644 --- a/support/xunistd.h +++ b/support/xunistd.h @@ -25,6 +25,7 @@ #include <sys/cdefs.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/mman.h> #include <unistd.h> __BEGIN_DECLS @@ -77,6 +78,13 @@ void xclose (int); /* Write the buffer. Retry on short writes. */ void xwrite (int, const void *, size_t); +/* 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 + /* Invoke mmap with a zero file offset. */ void *xmmap (void *addr, size_t length, int prot, int flags, int fd); void xmprotect (void *addr, size_t length, int prot); diff --git a/sysdeps/unix/sysv/linux/tst-pkey.c b/sysdeps/unix/sysv/linux/tst-pkey.c index df51f695bc..48b4308d63 100644 --- a/sysdeps/unix/sysv/linux/tst-pkey.c +++ b/sysdeps/unix/sysv/linux/tst-pkey.c @@ -175,7 +175,7 @@ do_test (void) /* pkey_mprotect with key -1 should work even when there is no protection key support. */ { - int *page = xmmap (NULL, pagesize, PROT_NONE, + int *page = xmmap (NULL, pagesize, PROT_NONE | PROT_MAX_RW, MAP_ANONYMOUS | MAP_PRIVATE, -1); TEST_COMPARE (pkey_mprotect (page, pagesize, PROT_READ | PROT_WRITE, -1), 0); |