jmb/hardened_malloc
1
0
Fork 0
mirror of https://github.com/GrapheneOS/hardened_malloc.git synced 2025-10-07 06:56:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Integrate into build system on other architectures,

Browse source 
flags for gcc and clang respectively
This commit is contained in:
Thor Preimesberger 2025-09-23 18:20:54 -04:00
parent 592a25aaeb
commit 10e27e2142
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
h_malloc.c
View file

@ -20,9 +20,12 @@
#include "random.h" #include "random.h"
#include "util.h" #include "util.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wundef"
#if __x86_64__ #if __x86_64__
#include "immintrin.h" #include "immintrin.h"
#endif #endif
#pragma GCC diagnostic pop
#ifdef USE_PKEY #ifdef USE_PKEY
#include <sys/mman.h> #include <sys/mman.h>
@ -409,7 +412,11 @@ static size_t get_free_slot(struct random_state *rng, size_t slots, const struct
// randomize start location for linear search (uniform random choice is too slow) // randomize start location for linear search (uniform random choice is too slow)
size_t random_index = get_random_u16_uniform(rng, slots); size_t random_index = get_random_u16_uniform(rng, slots);
size_t first_bitmap = random_index / U64_WIDTH; size_t first_bitmap = random_index / U64_WIDTH;
#if __x86_64__ && (__BMI2__) #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wundef"
// __BMI2__ is idiomatic to gcc unfortunately.
#if __x86_64__ && (__BMI2__ || (__clang__ && __BMI2INTRIN_H_))
#pragma GCC diagnostic pop
u64 random_split = ~(~0UL << _pext_u64(random_index, 8)); u64 random_split = ~(~0UL << _pext_u64(random_index, 8));
#else #else
u64 random_split = ~(~0UL << (random_index - first_bitmap * U64_WIDTH)); u64 random_split = ~(~0UL << (random_index - first_bitmap * U64_WIDTH));