jmb
/
hardened_malloc
mirror of https://github.com/GrapheneOS/hardened_malloc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add missing thread unseal / seal for atfork hooks

pull/65/head
Daniel Micay 2018-10-23 16:28:54 -04:00
parent 9d1567ce16
commit 299bd6d414
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
malloc.c
View File

@ -757,20 +757,25 @@ static void regions_delete(struct region_metadata *region) {
} }
static void full_lock(void) { static void full_lock(void) {
thread_unseal_metadata();
mutex_lock(&ro.region_allocator->lock); mutex_lock(&ro.region_allocator->lock);
for (unsigned class = 0; class < N_SIZE_CLASSES; class++) { for (unsigned class = 0; class < N_SIZE_CLASSES; class++) {
mutex_lock(&ro.size_class_metadata[class].lock); mutex_lock(&ro.size_class_metadata[class].lock);
} }
thread_seal_metadata();
} }
static void full_unlock(void) { static void full_unlock(void) {
thread_unseal_metadata();
mutex_unlock(&ro.region_allocator->lock); mutex_unlock(&ro.region_allocator->lock);
for (unsigned class = 0; class < N_SIZE_CLASSES; class++) { for (unsigned class = 0; class < N_SIZE_CLASSES; class++) {
mutex_unlock(&ro.size_class_metadata[class].lock); mutex_unlock(&ro.size_class_metadata[class].lock);
} }
thread_seal_metadata();
} }
static void post_fork_child(void) { static void post_fork_child(void) {
thread_unseal_metadata();
mutex_init(&ro.region_allocator->lock); mutex_init(&ro.region_allocator->lock);
random_state_init(&ro.region_allocator->rng); random_state_init(&ro.region_allocator->rng);
for (unsigned class = 0; class < N_SIZE_CLASSES; class++) { for (unsigned class = 0; class < N_SIZE_CLASSES; class++) {
@ -778,6 +783,7 @@ static void post_fork_child(void) {
mutex_init(&c->lock); mutex_init(&c->lock);
random_state_init(&c->rng); random_state_init(&c->rng);
} }
thread_seal_metadata();
} }
static inline bool is_init(void) { static inline bool is_init(void) {