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

workaround for audio service sorting bug

QQ3A.200805.001.2020.08.03.22
Daniel Micay 2020-05-28 20:19:14 -04:00
parent a5cd293d6d
commit 75c0ff692a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
h_malloc.c
View File

@ -84,6 +84,7 @@ static union {
bool zero_on_free; bool zero_on_free;
bool purge_slabs; bool purge_slabs;
bool region_quarantine_protect; bool region_quarantine_protect;
bool slot_randomize;
}; };
char padding[PAGE_SIZE]; char padding[PAGE_SIZE];
} ro __attribute__((aligned(PAGE_SIZE))); } ro __attribute__((aligned(PAGE_SIZE)));
@ -355,7 +356,7 @@ static u64 get_mask(size_t slots) {
} }
static size_t get_free_slot(struct random_state *rng, size_t slots, struct slab_metadata *metadata) { static size_t get_free_slot(struct random_state *rng, size_t slots, struct slab_metadata *metadata) {
if (SLOT_RANDOMIZE) { if (ro.slot_randomize) {
// randomize start location for linear search (uniform random choice is too slow) // randomize start location for linear search (uniform random choice is too slow)
unsigned random_index = get_random_u16_uniform(rng, slots); unsigned random_index = get_random_u16_uniform(rng, slots);
unsigned first_bitmap = random_index / 64; unsigned first_bitmap = random_index / 64;
@ -1052,17 +1053,24 @@ static inline void enforce_init(void) {
} }
} }
COLD static void handle_hal_bugs(void) { COLD static void handle_bugs(void) {
char path[256]; char path[256];
if (readlink("/proc/self/exe", path, sizeof(path)) == -1) { if (readlink("/proc/self/exe", path, sizeof(path)) == -1) {
return; return;
} }
const char camera_provider[] = "/vendor/bin/hw/android.hardware.camera.provider@2.4-service_64"; const char camera_provider[] = "/vendor/bin/hw/android.hardware.camera.provider@2.4-service_64";
if (strcmp(camera_provider, path) == 0) { if (strcmp(camera_provider, path) == 0) {
ro.zero_on_free = false; ro.zero_on_free = false;
ro.purge_slabs = false; ro.purge_slabs = false;
ro.region_quarantine_protect = false; ro.region_quarantine_protect = false;
} }
// DeviceDescriptor sorting wrongly relies on malloc addresses
const char audio_service[] = "/system/bin/audioserver";
if (strcmp(audio_service, path) == 0) {
ro.slot_randomize = false;
}
} }
COLD static void init_slow_path(void) { COLD static void init_slow_path(void) {
@ -1082,7 +1090,8 @@ COLD static void init_slow_path(void) {
ro.purge_slabs = true; ro.purge_slabs = true;
ro.zero_on_free = ZERO_ON_FREE; ro.zero_on_free = ZERO_ON_FREE;
ro.region_quarantine_protect = true; ro.region_quarantine_protect = true;
handle_hal_bugs(); ro.slot_randomize = SLOT_RANDOMIZE;
handle_bugs();
if (sysconf(_SC_PAGESIZE) != PAGE_SIZE) { if (sysconf(_SC_PAGESIZE) != PAGE_SIZE) {
fatal_error("page size mismatch"); fatal_error("page size mismatch");