com php-src: Revert "Support fixed address mmap without replacement": Zend/zend_alloc.c

From: Date: Wed, 29 Aug 2018 12:41:04 +0000
Subject: com php-src: Revert "Support fixed address mmap without replacement": Zend/zend_alloc.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-102919@lists.php.net to get a copy of this message
Commit: a55bcaa14ddba2df0c0f9c7f4444fc9d9f6564fd Author: Remi Collet <remi@php.net> Wed, 29 Aug 2018 14:41:04 +0200 Parents: 8cc7e2a2df912d86f6b9dc3f3d40e5de1d93214b Branches: PHP-7.3 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a55bcaa14ddba2df0c0f9c7f4444fc9d9f6564fd Log: Revert "Support fixed address mmap without replacement" This reverts commit 0f68ff5c92924deb9401ce66458e67f250ccde74. Changed paths: M Zend/zend_alloc.c Diff: diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 8eec54c..11691d8 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -423,13 +423,8 @@ static void *zend_mm_mmap_fixed(void *addr, size_t size) #ifdef _WIN32 return VirtualAlloc(addr, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); #else - int flags = MAP_PRIVATE | MAP_ANON; -#ifdef MAP_FIXED_NOREPLACE - flags |= MAP_FIXED_NOREPLACE; -#elif defined MAP_EXCL - flags |= MAP_FIXED | MAP_EXCL; -#endif - void *ptr = mmap(addr, size, PROT_READ | PROT_WRITE, flags /*| MAP_POPULATE | MAP_HUGETLB*/, -1, 0); + /* MAP_FIXED leads to discarding of the old mapping, so it can't be used. */ + void *ptr = mmap(addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON /*| MAP_POPULATE | MAP_HUGETLB*/, -1, 0); if (ptr == MAP_FAILED) { #if ZEND_MM_ERROR

« previous php.cvs (#102919) next »