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

perform init sanity checks before MPK unsealing

pull/131/head
Daniel Micay 2020-10-06 17:34:35 -04:00
parent 2bb1c39d31
commit b072022022
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
h_malloc.c
View File

@ -1612,9 +1612,9 @@ EXPORT size_t h_malloc_usable_size(H_MALLOC_USABLE_SIZE_CONST void *p) {
return 0; return 0;
} }
if (p < get_slab_region_end() && p >= ro.slab_region_start) {
thread_unseal_metadata(); thread_unseal_metadata();
if (p < get_slab_region_end() && p >= ro.slab_region_start) {
memory_corruption_check_small(p); memory_corruption_check_small(p);
thread_seal_metadata(); thread_seal_metadata();
@ -1623,6 +1623,8 @@ EXPORT size_t h_malloc_usable_size(H_MALLOC_USABLE_SIZE_CONST void *p) {
} }
enforce_init(); enforce_init();
thread_unseal_metadata();
struct region_allocator *ra = ro.region_allocator; struct region_allocator *ra = ro.region_allocator;
mutex_lock(&ra->lock); mutex_lock(&ra->lock);
struct region_metadata *region = regions_find(p); struct region_metadata *region = regions_find(p);
@ -1641,10 +1643,10 @@ EXPORT size_t h_malloc_object_size(void *p) {
return 0; return 0;
} }
thread_unseal_metadata();
void *slab_region_end = get_slab_region_end(); void *slab_region_end = get_slab_region_end();
if (p < slab_region_end && p >= ro.slab_region_start) { if (p < slab_region_end && p >= ro.slab_region_start) {
thread_unseal_metadata();
struct slab_size_class_info size_class_info = slab_size_class(p); struct slab_size_class_info size_class_info = slab_size_class(p);
size_t class = size_class_info.class; size_t class = size_class_info.class;
size_t size_class = size_classes[class]; size_t size_class = size_classes[class];
@ -1681,6 +1683,8 @@ EXPORT size_t h_malloc_object_size(void *p) {
return SIZE_MAX; return SIZE_MAX;
} }
thread_unseal_metadata();
struct region_allocator *ra = ro.region_allocator; struct region_allocator *ra = ro.region_allocator;
mutex_lock(&ra->lock); mutex_lock(&ra->lock);
struct region_metadata *region = regions_find(p); struct region_metadata *region = regions_find(p);