archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3'

Browse source 
* PHP-8.3:
  Fix asan shadow memory and shared_alloc_mmap clash
This commit is contained in:
Ilija Tovilo 2023-12-07 18:29:23 +01:00
commit d6d838a21a
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/opcache/shared_alloc_mmap.c
View file

@ -48,7 +48,7 @@
# define MAP_HUGETLB MAP_ALIGNED_SUPER # define MAP_HUGETLB MAP_ALIGNED_SUPER
#endif #endif
#if (defined(__linux__) || defined(__FreeBSD__)) && (defined(__x86_64__) || defined (__aarch64__)) #if (defined(__linux__) || defined(__FreeBSD__)) && (defined(__x86_64__) || defined (__aarch64__)) && !defined(__SANITIZE_ADDRESS__)
static void *find_prefered_mmap_base(size_t requested_size) static void *find_prefered_mmap_base(size_t requested_size)
{ {
size_t huge_page_size = 2 * 1024 * 1024; size_t huge_page_size = 2 * 1024 * 1024;
@ -186,7 +186,7 @@ static int create_segments(size_t requested_size, zend_shared_segment ***shared_
#ifdef MAP_JIT #ifdef MAP_JIT
flags |= MAP_JIT; flags |= MAP_JIT;
#endif #endif
#if (defined(__linux__) || defined(__FreeBSD__)) && (defined(__x86_64__) || defined (__aarch64__)) #if (defined(__linux__) || defined(__FreeBSD__)) && (defined(__x86_64__) || defined (__aarch64__)) && !defined(__SANITIZE_ADDRESS__)
void *hint = find_prefered_mmap_base(requested_size); void *hint = find_prefered_mmap_base(requested_size);
if (hint != MAP_FAILED) { if (hint != MAP_FAILED) {
# ifdef MAP_HUGETLB # ifdef MAP_HUGETLB