Skip to content

Commit a55bcaa

Browse files
committed
Revert "Support fixed address mmap without replacement"
This reverts commit 0f68ff5.
1 parent 8cc7e2a commit a55bcaa

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

Zend/zend_alloc.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -423,13 +423,8 @@ static void *zend_mm_mmap_fixed(void *addr, size_t size)
423423
#ifdef _WIN32
424424
return VirtualAlloc(addr, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
425425
#else
426-
int flags = MAP_PRIVATE | MAP_ANON;
427-
#ifdef MAP_FIXED_NOREPLACE
428-
flags |= MAP_FIXED_NOREPLACE;
429-
#elif defined MAP_EXCL
430-
flags |= MAP_FIXED | MAP_EXCL;
431-
#endif
432-
void *ptr = mmap(addr, size, PROT_READ | PROT_WRITE, flags /*| MAP_POPULATE | MAP_HUGETLB*/, -1, 0);
426+
/* MAP_FIXED leads to discarding of the old mapping, so it can't be used. */
427+
void *ptr = mmap(addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON /*| MAP_POPULATE | MAP_HUGETLB*/, -1, 0);
433428

434429
if (ptr == MAP_FAILED) {
435430
#if ZEND_MM_ERROR

0 commit comments

Comments
 (0)