mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-07-06 03:21:15 +00:00
181519cf38
11b3a0c2c5db115412c37195#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 10aa9cc05d0710a8cdbb6352#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 9abdf523d269e4b9b31e6f#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>
81 lines
2.0 KiB
Diff
81 lines
2.0 KiB
Diff
From 1ebb1654556ed74d63e43fe7dbbceae5b20f569f Mon Sep 17 00:00:00 2001
|
|
From: Daniel Micay <danielmicay@gmail.com>
|
|
Date: Sat, 7 Feb 2015 20:14:24 -0500
|
|
Subject: [PATCH] add memory protection for at_quick_exit
|
|
|
|
---
|
|
.../lib/libc/stdlib/quick_exit.c | 41 ++++++++++++++++---
|
|
1 file changed, 36 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/libc/upstream-freebsd/lib/libc/stdlib/quick_exit.c b/libc/upstream-freebsd/lib/libc/stdlib/quick_exit.c
|
|
index ef8cdb1b40..b23d8642ae 100644
|
|
--- a/libc/upstream-freebsd/lib/libc/stdlib/quick_exit.c
|
|
+++ b/libc/upstream-freebsd/lib/libc/stdlib/quick_exit.c
|
|
@@ -28,6 +28,10 @@
|
|
|
|
#include <stdlib.h>
|
|
#include <pthread.h>
|
|
+#include <sys/mman.h>
|
|
+#include <unistd.h>
|
|
+
|
|
+#include "private/bionic_prctl.h"
|
|
|
|
/**
|
|
* Linked list of quick exit handlers. This is simpler than the atexit()
|
|
@@ -39,6 +43,10 @@ struct quick_exit_handler {
|
|
void (*cleanup)(void);
|
|
};
|
|
|
|
+static struct quick_exit_handler *pool_page;
|
|
+static struct quick_exit_handler *pool;
|
|
+static size_t pool_size;
|
|
+
|
|
/**
|
|
* Lock protecting the handlers list.
|
|
*/
|
|
@@ -51,16 +59,39 @@ static struct quick_exit_handler *handlers;
|
|
int
|
|
at_quick_exit(void (*func)(void))
|
|
{
|
|
+ size_t page_size = getpagesize();
|
|
struct quick_exit_handler *h;
|
|
-
|
|
- h = malloc(sizeof(*h));
|
|
|
|
- if (NULL == h)
|
|
- return (1);
|
|
- h->cleanup = func;
|
|
pthread_mutex_lock(&atexit_mutex);
|
|
+
|
|
+ if (pool_size < sizeof(*h)) {
|
|
+ void *ptr = mmap(NULL, page_size, PROT_READ|PROT_WRITE,
|
|
+ MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
|
|
+ if (ptr == MAP_FAILED) {
|
|
+ pthread_mutex_unlock(&atexit_mutex);
|
|
+ return (1);
|
|
+ }
|
|
+ prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, ptr, page_size,
|
|
+ "at_quick_exit handlers");
|
|
+ pool_page = pool = ptr;
|
|
+ pool_size = page_size;
|
|
+ } else {
|
|
+ if (mprotect(pool_page, page_size, PROT_READ|PROT_WRITE)) {
|
|
+ pthread_mutex_unlock(&atexit_mutex);
|
|
+ return (1);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ h = pool++;
|
|
+ pool_size -= sizeof(*h);
|
|
+
|
|
+ h->cleanup = func;
|
|
+
|
|
h->next = handlers;
|
|
handlers = h;
|
|
+
|
|
+ mprotect(pool_page, page_size, PROT_READ);
|
|
+
|
|
pthread_mutex_unlock(&atexit_mutex);
|
|
return (0);
|
|
}
|