lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Simplify perturb_byte logic.

Browse Source
This commit is contained in:
Ondřej Bílka
2013-12-09 17:25:19 +01:00
parent f3eeb3fc56
commit e8349efd46
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2013-12-09 Ondřej Bílka <neleai@seznam.cz>
* malloc/malloc.c (alloc_perturb, free_perturb): Convert from
macro to a function. Check for zero perturb_byte.
(_int_malloc, _int_free): Remove zero perturb_byte checks.
2013-12-09 Ondřej Bílka <neleai@seznam.cz> 2013-12-09 Ondřej Bílka <neleai@seznam.cz>
* malloc/malloc.c: (force_reg): Remove. * malloc/malloc.c: (force_reg): Remove.

45
malloc/malloc.c
View File

@ -1870,8 +1870,20 @@ static int check_action = DEFAULT_CHECK_ACTION;
static int perturb_byte; static int perturb_byte;
#define alloc_perturb(p, n) memset (p, (perturb_byte ^ 0xff) & 0xff, n) static inline void
#define free_perturb(p, n) memset (p, perturb_byte & 0xff, n) alloc_perturb (char *p, size_t n)
{
if (__glibc_unlikely (perturb_byte))
memset (p, perturb_byte ^ 0xff, n);
}
static inline void
free_perturb (char *p, size_t n)
{
if (__glibc_unlikely (perturb_byte))
memset (p, perturb_byte, n);
}
#include <stap-probe.h> #include <stap-probe.h>
@ -3287,8 +3299,7 @@ _int_malloc(mstate av, size_t bytes)
} }
check_remalloced_chunk(av, victim, nb); check_remalloced_chunk(av, victim, nb);
void *p = chunk2mem(victim); void *p = chunk2mem(victim);
if (__builtin_expect (perturb_byte, 0)) alloc_perturb (p, bytes);
alloc_perturb (p, bytes);
return p; return p;
} }
} }
@ -3323,8 +3334,7 @@ _int_malloc(mstate av, size_t bytes)
victim->size |= NON_MAIN_ARENA; victim->size |= NON_MAIN_ARENA;
check_malloced_chunk(av, victim, nb); check_malloced_chunk(av, victim, nb);
void *p = chunk2mem(victim); void *p = chunk2mem(victim);
if (__builtin_expect (perturb_byte, 0)) alloc_perturb (p, bytes);
alloc_perturb (p, bytes);
return p; return p;
} }
} }
@ -3403,8 +3413,7 @@ _int_malloc(mstate av, size_t bytes)
check_malloced_chunk(av, victim, nb); check_malloced_chunk(av, victim, nb);
void *p = chunk2mem(victim); void *p = chunk2mem(victim);
if (__builtin_expect (perturb_byte, 0)) alloc_perturb (p, bytes);
alloc_perturb (p, bytes);
return p; return p;
} }
@ -3420,8 +3429,7 @@ _int_malloc(mstate av, size_t bytes)
victim->size |= NON_MAIN_ARENA; victim->size |= NON_MAIN_ARENA;
check_malloced_chunk(av, victim, nb); check_malloced_chunk(av, victim, nb);
void *p = chunk2mem(victim); void *p = chunk2mem(victim);
if (__builtin_expect (perturb_byte, 0)) alloc_perturb (p, bytes);
alloc_perturb (p, bytes);
return p; return p;
} }
@ -3545,8 +3553,7 @@ _int_malloc(mstate av, size_t bytes)
} }
check_malloced_chunk(av, victim, nb); check_malloced_chunk(av, victim, nb);
void *p = chunk2mem(victim); void *p = chunk2mem(victim);
if (__builtin_expect (perturb_byte, 0)) alloc_perturb (p, bytes);
alloc_perturb (p, bytes);
return p; return p;
} }
} }
@ -3649,8 +3656,7 @@ _int_malloc(mstate av, size_t bytes)
} }
check_malloced_chunk(av, victim, nb); check_malloced_chunk(av, victim, nb);
void *p = chunk2mem(victim); void *p = chunk2mem(victim);
if (__builtin_expect (perturb_byte, 0)) alloc_perturb (p, bytes);
alloc_perturb (p, bytes);
return p; return p;
} }
} }
@ -3684,8 +3690,7 @@ _int_malloc(mstate av, size_t bytes)
check_malloced_chunk(av, victim, nb); check_malloced_chunk(av, victim, nb);
void *p = chunk2mem(victim); void *p = chunk2mem(victim);
if (__builtin_expect (perturb_byte, 0)) alloc_perturb (p, bytes);
alloc_perturb (p, bytes);
return p; return p;
} }
@ -3705,7 +3710,7 @@ _int_malloc(mstate av, size_t bytes)
*/ */
else { else {
void *p = sysmalloc(nb, av); void *p = sysmalloc(nb, av);
if (p != NULL && __builtin_expect (perturb_byte, 0)) if (p != NULL)
alloc_perturb (p, bytes); alloc_perturb (p, bytes);
return p; return p;
} }
@ -3798,8 +3803,7 @@ _int_free(mstate av, mchunkptr p, int have_lock)
} }
} }
if (__builtin_expect (perturb_byte, 0)) free_perturb (chunk2mem(p), size - 2 * SIZE_SZ);
free_perturb (chunk2mem(p), size - 2 * SIZE_SZ);
set_fastchunks(av); set_fastchunks(av);
unsigned int idx = fastbin_index(size); unsigned int idx = fastbin_index(size);
@ -3881,8 +3885,7 @@ _int_free(mstate av, mchunkptr p, int have_lock)
goto errout; goto errout;
} }
if (__builtin_expect (perturb_byte, 0)) free_perturb (chunk2mem(p), size - 2 * SIZE_SZ);
free_perturb (chunk2mem(p), size - 2 * SIZE_SZ);
/* consolidate backward */ /* consolidate backward */
if (!prev_inuse(p)) { if (!prev_inuse(p)) {