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

fix handling of random bases for class regions

pull/50/head
Daniel Micay 2018-08-24 03:52:01 -04:00
parent 0d51459dc9
commit 83dabbd8fa
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
malloc.c
View File

@ -364,7 +364,7 @@ static void *slab_allocate(size_t requested_size) {
static size_t slab_size_class(void *p) { static size_t slab_size_class(void *p) {
size_t offset = (char *)p - (char *)ro.slab_region_start; size_t offset = (char *)p - (char *)ro.slab_region_start;
return offset / class_region_size; return offset / real_class_region_size;
} }
static size_t slab_usable_size(void *p) { static size_t slab_usable_size(void *p) {
@ -597,8 +597,9 @@ COLD static void init_slow_path(void) {
fatal_error("mutex initialization failed"); fatal_error("mutex initialization failed");
} }
size_t gap = (get_random_size_uniform(&rng, (real_class_region_size - class_region_size) / PAGE_SIZE) + 1) * PAGE_SIZE; size_t bound = (real_class_region_size - class_region_size) / PAGE_SIZE - 1;
c->class_region_start = (char *)ro.slab_region_start + class_region_size * i + gap; size_t gap = (get_random_size_uniform(&rng, bound) + 1) * PAGE_SIZE;
c->class_region_start = (char *)ro.slab_region_start + real_class_region_size * i + gap;
size_t size = size_classes[i]; size_t size = size_classes[i];
if (size == 0) { if (size == 0) {