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

support for slabs with 1 slot for largest sizes

pull/87/head
Daniel Micay 2019-04-10 16:26:39 -04:00
parent b31e8dacb1
commit 7a89a7b8c5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
h_malloc.c
View File

@ -134,7 +134,7 @@ static const u16 size_class_slots[] = {
/* 2048 */ 6, 5, 4, 4, /* 2048 */ 6, 5, 4, 4,
#if CONFIG_EXTENDED_SIZE_CLASSES #if CONFIG_EXTENDED_SIZE_CLASSES
/* 4096 */ 2, 2, 2, 2, /* 4096 */ 2, 2, 2, 2,
/* 8192 */ 2, 2, 2, 2, /* 8192 */ 1, 1, 1, 1,
#endif #endif
}; };
@ -501,7 +501,7 @@ static inline void *allocate_small(size_t requested_size) {
metadata->next = NULL; metadata->next = NULL;
metadata->prev = NULL; metadata->prev = NULL;
c->partial_slabs = metadata; c->partial_slabs = slots > 1 ? metadata : NULL;
void *slab = get_slab(c, slab_size, metadata); void *slab = get_slab(c, slab_size, metadata);
size_t slot = get_free_slot(&c->rng, slots, metadata); size_t slot = get_free_slot(&c->rng, slots, metadata);
@ -535,7 +535,7 @@ static inline void *allocate_small(size_t requested_size) {
metadata->next = NULL; metadata->next = NULL;
metadata->prev = NULL; metadata->prev = NULL;
c->partial_slabs = metadata; c->partial_slabs = slots > 1 ? metadata : NULL;
size_t slot = get_free_slot(&c->rng, slots, metadata); size_t slot = get_free_slot(&c->rng, slots, metadata);
set_slot(metadata, slot); set_slot(metadata, slot);
@ -557,7 +557,7 @@ static inline void *allocate_small(size_t requested_size) {
} }
metadata->canary_value = get_random_canary(&c->rng); metadata->canary_value = get_random_canary(&c->rng);
c->partial_slabs = metadata; c->partial_slabs = slots > 1 ? metadata : NULL;
void *slab = get_slab(c, slab_size, metadata); void *slab = get_slab(c, slab_size, metadata);
size_t slot = get_free_slot(&c->rng, slots, metadata); size_t slot = get_free_slot(&c->rng, slots, metadata);
set_slot(metadata, slot); set_slot(metadata, slot);
@ -726,6 +726,7 @@ static inline void deallocate_small(void *p, const size_t *expected_size) {
clear_quarantine(metadata, slot); clear_quarantine(metadata, slot);
#endif #endif
// triggered even for slots == 1 and then undone below
if (!has_free_slots(slots, metadata)) { if (!has_free_slots(slots, metadata)) {
metadata->next = c->partial_slabs; metadata->next = c->partial_slabs;
metadata->prev = NULL; metadata->prev = NULL;