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

fix builds with both random and queue quarantine

pull/69/head
Daniel Micay 2019-01-02 13:23:49 -05:00
parent 5d3b299209
commit bc2cb5c828
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

@ -592,28 +592,28 @@ static inline void deallocate_small(void *p, const size_t *expected_size) {
#if SLAB_QUARANTINE_RANDOM_SIZE > 0 #if SLAB_QUARANTINE_RANDOM_SIZE > 0
size_t random_index = get_random_u16_uniform(&c->rng, SLAB_QUARANTINE_RANDOM_SIZE); size_t random_index = get_random_u16_uniform(&c->rng, SLAB_QUARANTINE_RANDOM_SIZE);
void *substitute = c->quarantine_random[random_index]; void *random_substitute = c->quarantine_random[random_index];
c->quarantine_random[random_index] = p; c->quarantine_random[random_index] = p;
if (substitute == NULL) { if (random_substitute == NULL) {
mutex_unlock(&c->lock); mutex_unlock(&c->lock);
return; return;
} }
p = substitute; p = random_substitute;
#endif #endif
#if SLAB_QUARANTINE_QUEUE_SIZE > 0 #if SLAB_QUARANTINE_QUEUE_SIZE > 0
void *substitute = c->quarantine_queue[c->quarantine_queue_index]; void *queue_substitute = c->quarantine_queue[c->quarantine_queue_index];
c->quarantine_queue[c->quarantine_queue_index] = p; c->quarantine_queue[c->quarantine_queue_index] = p;
c->quarantine_queue_index = (c->quarantine_queue_index + 1) % SLAB_QUARANTINE_QUEUE_SIZE; c->quarantine_queue_index = (c->quarantine_queue_index + 1) % SLAB_QUARANTINE_QUEUE_SIZE;
if (substitute == NULL) { if (queue_substitute == NULL) {
mutex_unlock(&c->lock); mutex_unlock(&c->lock);
return; return;
} }
p = substitute; p = queue_substitute;
#endif #endif
metadata = get_metadata(c, p); metadata = get_metadata(c, p);