mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-10-10 15:01:27 +02:00
68 lines
2.2 KiB
Diff
68 lines
2.2 KiB
Diff
From 88bb9f90ec1e4b43fb78596c8ff7577c92592eb4 Mon Sep 17 00:00:00 2001
|
|
From: Natanael Copa <ncopa@alpinelinux.org>
|
|
Date: Fri, 25 Nov 2011 08:36:52 +0000
|
|
Subject: [PATCH 3/4] xulrunner: jemalloc aslr
|
|
|
|
---
|
|
memory/jemalloc/jemalloc.c | 33 ++++++++++++++++++++++-----------
|
|
1 files changed, 22 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
|
|
index ad7c450..91de92c 100644
|
|
--- a/memory/mozjemalloc/jemalloc.c
|
|
+++ b/memory/mozjemalloc/jemalloc.c
|
|
@@ -410,7 +410,7 @@ void *_mmap(void *addr, size_t length, int prot, int flags,
|
|
static const bool __isthreaded = true;
|
|
#endif
|
|
|
|
-#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN)
|
|
+#if defined(MOZ_MEMORY_SOLARIS) || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
|
|
#define JEMALLOC_USES_MAP_ALIGN /* Required on Solaris 10. Might improve performance elsewhere. */
|
|
#endif
|
|
|
|
@@ -2181,20 +2181,31 @@ pages_map_align(size_t size, int pfd, size_t alignment)
|
|
* We don't use MAP_FIXED here, because it can cause the *replacement*
|
|
* of existing mappings, and we only want to create new mappings.
|
|
*/
|
|
-#ifdef MALLOC_PAGEFILE
|
|
- if (pfd != -1) {
|
|
- ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
|
|
- MAP_NOSYNC | MAP_ALIGN, pfd, 0);
|
|
- } else
|
|
-#endif
|
|
- {
|
|
- ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
|
|
- MAP_NOSYNC | MAP_ALIGN | MAP_ANON, -1, 0);
|
|
- }
|
|
+ ret = mmap(NULL, size + alignment, PROT_READ | PROT_WRITE, MAP_PRIVATE |
|
|
+ MAP_NOSYNC| MAP_ANON, -1, 0);
|
|
assert(ret != NULL);
|
|
|
|
if (ret == MAP_FAILED)
|
|
ret = NULL;
|
|
+ else {
|
|
+ uintptr_t aligned_ret;
|
|
+ size_t extra_size;
|
|
+
|
|
+ aligned_ret = (uintptr_t)ret + alignment - 1;
|
|
+ aligned_ret &= ~(alignment - 1);
|
|
+ extra_size = aligned_ret - (uintptr_t)ret;
|
|
+ munmap(ret, extra_size);
|
|
+ munmap(ret + extra_size + size, alignment - extra_size);
|
|
+ ret = (void *)aligned_ret;
|
|
+#ifdef MALLOC_PAGEFILE
|
|
+ if (pfd != -1) {
|
|
+ ret = mmap(ret, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
|
|
+ MAP_NOSYNC | MAP_FIXED, pfd, 0);
|
|
+ }
|
|
+ if (ret == MAP_FAILED)
|
|
+ ret = NULL;
|
|
+#endif
|
|
+ }
|
|
return (ret);
|
|
}
|
|
#endif
|
|
--
|
|
1.7.7.4
|
|
|