diff options
| author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-10-21 12:35:33 +0100 |
|---|---|---|
| committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2022-10-27 14:46:53 +0100 |
| commit | af11ceae3867a3786308738a6870a8f1016a865e (patch) | |
| tree | 7a5c3933dafe81533d3a6d560ca4e7839b62119a /malloc/malloc.c | |
| parent | dc8f9560104f0803e53fa23bfd011aa9878d5a97 (diff) | |
| download | glibc-af11ceae3867a3786308738a6870a8f1016a865e.tar glibc-af11ceae3867a3786308738a6870a8f1016a865e.tar.gz glibc-af11ceae3867a3786308738a6870a8f1016a865e.tar.bz2 glibc-af11ceae3867a3786308738a6870a8f1016a865e.zip | |
cheri: malloc: Ensure the mappings have RW permission
The arena allocator incrementally applies RW mprotect to a PROT_NONE
mapping. Use PROT_MAX to ensure the pointers derived from the original
mapping have RW capability permission.
Diffstat (limited to 'malloc/malloc.c')
| -rw-r--r-- | malloc/malloc.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index 02df29d2ad..701adbebca 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -1134,8 +1134,16 @@ static mchunkptr mremap_chunk(mchunkptr p, size_t new_size); # define MAP_NORESERVE 0 #endif +/* Allow RW mprotect later, on CHERI this means RW capability permission. */ +#ifdef PROT_MAX +# define PROT_MAX_RW PROT_MAX (PROT_READ | PROT_WRITE) +#else +# define PROT_MAX_RW 0 +#endif + #define MMAP(addr, size, prot, flags) \ - __mmap((addr), (size), (prot), (flags)|MAP_ANONYMOUS|MAP_PRIVATE, -1, 0) + __mmap((addr), (size), (prot)|PROT_MAX_RW, \ + (flags)|MAP_ANONYMOUS|MAP_PRIVATE, -1, 0) /* |