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

avoid unnecessary preprocessor use for canary mask

pull/50/head
Daniel Micay 2018-10-03 17:17:20 -04:00
parent 93fcc6a978
commit 5811bd184c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
malloc.c
View File

@ -274,11 +274,9 @@ static void write_after_free_check(char *p, size_t size) {
} }
} }
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ static const uint64_t canary_mask = __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ ?
static const uint64_t canary_mask = 0xffffffffffffff00UL; 0xffffffffffffff00UL :
#else 0x00ffffffffffffffUL;
static const uint64_t canary_mask = 0x00ffffffffffffffUL;
#endif
static void set_canary(struct slab_metadata *metadata, void *p, size_t size) { static void set_canary(struct slab_metadata *metadata, void *p, size_t size) {
memcpy((char *)p + size - canary_size, &metadata->canary_value, canary_size); memcpy((char *)p + size - canary_size, &metadata->canary_value, canary_size);