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

mark more out-of-memory conditions as unlikely

pull/189/head
Daniel Micay 2022-01-21 19:02:35 -05:00
parent 3cffc1e1af
commit 8f0b252c33
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
h_malloc.c
View File

@ -292,7 +292,7 @@ static size_t get_metadata_max(size_t slab_size) {
static struct slab_metadata *alloc_metadata(struct size_class *c, size_t slab_size, bool non_zero_size) { static struct slab_metadata *alloc_metadata(struct size_class *c, size_t slab_size, bool non_zero_size) {
if (unlikely(c->metadata_count >= c->metadata_allocated)) { if (unlikely(c->metadata_count >= c->metadata_allocated)) {
size_t metadata_max = get_metadata_max(slab_size); size_t metadata_max = get_metadata_max(slab_size);
if (c->metadata_count >= metadata_max) { if (unlikely(c->metadata_count >= metadata_max)) {
errno = ENOMEM; errno = ENOMEM;
return NULL; return NULL;
} }
@ -300,7 +300,7 @@ static struct slab_metadata *alloc_metadata(struct size_class *c, size_t slab_si
if (allocate > metadata_max) { if (allocate > metadata_max) {
allocate = metadata_max; allocate = metadata_max;
} }
if (memory_protect_rw_metadata(c->slab_info, allocate * sizeof(struct slab_metadata))) { if (unlikely(memory_protect_rw_metadata(c->slab_info, allocate * sizeof(struct slab_metadata)))) {
return NULL; return NULL;
} }
c->metadata_allocated = allocate; c->metadata_allocated = allocate;
@ -1231,7 +1231,7 @@ static void *allocate_large(size_t size) {
} }
mutex_lock(&ra->lock); mutex_lock(&ra->lock);
if (regions_insert(p, size, guard_size)) { if (unlikely(regions_insert(p, size, guard_size))) {
mutex_unlock(&ra->lock); mutex_unlock(&ra->lock);
deallocate_pages(p, size, guard_size); deallocate_pages(p, size, guard_size);
return NULL; return NULL;
@ -1280,7 +1280,7 @@ static int allocate_aligned(unsigned arena, void **memptr, size_t alignment, siz
} }
void *p = allocate(arena, size); void *p = allocate(arena, size);
if (p == NULL) { if (unlikely(p == NULL)) {
return ENOMEM; return ENOMEM;
} }
*memptr = p; *memptr = p;
@ -1299,12 +1299,12 @@ static int allocate_aligned(unsigned arena, void **memptr, size_t alignment, siz
mutex_unlock(&ra->lock); mutex_unlock(&ra->lock);
void *p = allocate_pages_aligned(size, alignment, guard_size, "malloc large"); void *p = allocate_pages_aligned(size, alignment, guard_size, "malloc large");
if (p == NULL) { if (unlikely(p == NULL)) {
return ENOMEM; return ENOMEM;
} }
mutex_lock(&ra->lock); mutex_lock(&ra->lock);
if (regions_insert(p, size, guard_size)) { if (unlikely(regions_insert(p, size, guard_size))) {
mutex_unlock(&ra->lock); mutex_unlock(&ra->lock);
deallocate_pages(p, size, guard_size); deallocate_pages(p, size, guard_size);
return ENOMEM; return ENOMEM;