
11b3a0c2c5db
115412c37195
#explicit zero 1131456ac632
#brk 1158ebc243ea
#random 115323b39f7e
#undefined 116a91d9dddb
#merge 11a042b5a0ba
#vla formatting 119ec639de1b
#pthread 1149571a0a49
#read only 11149cc5ccb8
#zero 112e613ccbe7
#fork mmap 11e239c7dff8
#memprot pthread 110b03d92b7f
#xor 11de08419b82
#junk 11897d4903e2
#guard 11648cd68ca3
#ptrhread guard 110bc4dbcbd2
#stack rand 10aa9cc05d07
10a8cdbb6352
#explicit zero 10b28302c668
#brk 109f8be7d07c
#random 10cb91a7ee3a
#undefined 1008279e2fdd
#merge 106a18bd565d
#vla formatting 102f392c2d08
#pthread 108bbce1bc50
#read only 10725f61db82
#zero 104cd257135f
#fork mmap 109220cf622b
#memprot pthread 108ef71d1ffd
#memprot exit 100eaef1abbd
#xor 1064f1cc2148
#junk 105c42a527cf
#guard 105cc8c34e60
#pthread guard 107f61cc8a1c
#stack rand 9abdf523d26
9e4b9b31e6f
#explicit zero 9a3a22a63d2
#brk 97444dbc3cf
#random 9dcd3b72ac9
#undefined 9543e1df342
#merge 9611e5691f7
#vla formatting 98de97ce864
#pthread 9a475717042
#read only 97f0947cc0e
#zero 9e9751d3370
#fork mmap 983cd86d0d5
#memprot pthread 91ebb165455
#memprot exit 9488ba483cf
#xor 9f9351d884b
#junk 985e5bca0a5
#move Signed-off-by: Tad <tad@spotco.us>
85 lines
2.4 KiB
Diff
85 lines
2.4 KiB
Diff
From 2e613ccbe7a6b2aa8f1688ed8493267d12c66d23 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Micay <danielmicay@gmail.com>
|
|
Date: Wed, 2 Dec 2015 23:37:28 -0500
|
|
Subject: [PATCH] switch pthread_atfork handler allocation to mmap
|
|
|
|
Signed-off-by: anupritaisno1 <www.anuprita804@gmail.com>
|
|
---
|
|
libc/bionic/pthread_atfork.cpp | 35 ++++++++++++++++++++++++++++------
|
|
1 file changed, 29 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/libc/bionic/pthread_atfork.cpp b/libc/bionic/pthread_atfork.cpp
|
|
index 0dcabdfb2d..6306052ee3 100644
|
|
--- a/libc/bionic/pthread_atfork.cpp
|
|
+++ b/libc/bionic/pthread_atfork.cpp
|
|
@@ -29,6 +29,9 @@
|
|
#include <errno.h>
|
|
#include <pthread.h>
|
|
#include <stdlib.h>
|
|
+#include <sys/mman.h>
|
|
+#include <sys/prctl.h>
|
|
+#include <unistd.h>
|
|
|
|
#include "platform/bionic/macros.h"
|
|
|
|
@@ -43,6 +46,8 @@ struct atfork_t {
|
|
void* dso_handle;
|
|
};
|
|
|
|
+static atfork_t* pool;
|
|
+
|
|
class atfork_list_t {
|
|
public:
|
|
constexpr atfork_list_t() : first_(nullptr), last_(nullptr) {}
|
|
@@ -101,7 +106,8 @@ class atfork_list_t {
|
|
last_ = entry->prev;
|
|
}
|
|
|
|
- free(entry);
|
|
+ entry->next = pool;
|
|
+ pool = entry;
|
|
}
|
|
|
|
atfork_t* first_;
|
|
@@ -154,18 +160,35 @@ void __bionic_atfork_run_parent() {
|
|
// __register_atfork is the name used by glibc
|
|
extern "C" int __register_atfork(void (*prepare)(void), void (*parent)(void),
|
|
void(*child)(void), void* dso) {
|
|
- atfork_t* entry = reinterpret_cast<atfork_t*>(malloc(sizeof(atfork_t)));
|
|
- if (entry == nullptr) {
|
|
- return ENOMEM;
|
|
+ pthread_mutex_lock(&g_atfork_list_mutex);
|
|
+
|
|
+ if (!pool) {
|
|
+ size_t page_size = getpagesize();
|
|
+ char* page = static_cast<char*>(mmap(NULL, page_size, PROT_READ|PROT_WRITE,
|
|
+ MAP_ANONYMOUS|MAP_PRIVATE, -1, 0));
|
|
+ if (page == MAP_FAILED) {
|
|
+ pthread_mutex_unlock(&g_atfork_list_mutex);
|
|
+ return ENOMEM;
|
|
+ }
|
|
+
|
|
+ prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, page, page_size,
|
|
+ "atfork handlers");
|
|
+
|
|
+ for (char* it = page; it < page + page_size - sizeof(atfork_t); it += sizeof(atfork_t)) {
|
|
+ atfork_t* node = reinterpret_cast<atfork_t*>(it);
|
|
+ node->next = pool;
|
|
+ pool = node;
|
|
+ }
|
|
}
|
|
|
|
+ atfork_t* entry = pool;
|
|
+ pool = entry->next;
|
|
+
|
|
entry->prepare = prepare;
|
|
entry->parent = parent;
|
|
entry->child = child;
|
|
entry->dso_handle = dso;
|
|
|
|
- pthread_mutex_lock(&g_atfork_list_mutex);
|
|
-
|
|
g_atfork_list.push_back(entry);
|
|
|
|
pthread_mutex_unlock(&g_atfork_list_mutex);
|