diff options
| author | van Hauser <vh@thc.org> | 2021-03-24 18:19:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 18:19:45 +0100 |
| commit | c2b58cff6fa7d6af766cc6f686046d7e043a3977 (patch) | |
| tree | 0c04cd932d129b45e31fd17c328844295677ca5f /utils/libdislocator | |
| parent | 958436be4ba057e8409787e7ff4ddcfa095c46da (diff) | |
| parent | 6e2a0ef233fc09e8751e2d4cba3298610d8bed2c (diff) | |
| download | afl++-c2b58cff6fa7d6af766cc6f686046d7e043a3977.tar.gz | |
Merge pull request #843 from AFLplusplus/tmp
Tmp
Diffstat (limited to 'utils/libdislocator')
| -rw-r--r-- | utils/libdislocator/libdislocator.so.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/utils/libdislocator/libdislocator.so.c b/utils/libdislocator/libdislocator.so.c index c041fec6..1b247c86 100644 --- a/utils/libdislocator/libdislocator.so.c +++ b/utils/libdislocator/libdislocator.so.c @@ -168,7 +168,7 @@ static void *__dislocator_alloc(size_t len) { u8 * ret, *base; size_t tlen; - int flags, fd, sp; + int flags, protflags, fd, sp; if (total_mem + len > max_mem || total_mem + len < total_mem) { @@ -191,8 +191,14 @@ static void *__dislocator_alloc(size_t len) { base = NULL; tlen = (1 + PG_COUNT(rlen + 8)) * PAGE_SIZE; + protflags = PROT_READ | PROT_WRITE; flags = MAP_PRIVATE | MAP_ANONYMOUS; fd = -1; +#if defined(PROT_MAX) + // apply when sysctl vm.imply_prot_max is set to 1 + // no-op otherwise + protflags |= PROT_MAX(PROT_READ | PROT_WRITE); +#endif #if defined(USEHUGEPAGE) sp = (rlen >= SUPER_PAGE_SIZE && !(rlen % SUPER_PAGE_SIZE)); @@ -215,7 +221,7 @@ static void *__dislocator_alloc(size_t len) { (void)sp; #endif - ret = (u8 *)mmap(base, tlen, PROT_READ | PROT_WRITE, flags, fd, 0); + ret = (u8 *)mmap(base, tlen, protflags, flags, fd, 0); #if defined(USEHUGEPAGE) /* We try one more time with regular call */ if (ret == MAP_FAILED) { @@ -229,7 +235,7 @@ static void *__dislocator_alloc(size_t len) { #elif defined(__sun) flags &= -MAP_ALIGN; #endif - ret = (u8 *)mmap(NULL, tlen, PROT_READ | PROT_WRITE, flags, fd, 0); + ret = (u8 *)mmap(NULL, tlen, protflags, flags, fd, 0); } |