mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-30 01:46:30 -05:00
a53062ca0b
Adds ptrace_scope and timeout options to 17.1, tested working
Also adds hardened_malloc to 15.1, but failing to compile:
external/hardened_malloc/h_malloc.c:1688:18: error: use of undeclared identifier 'M_PURGE'
if (param == M_PURGE) {
^
external/hardened_malloc/h_malloc.c:1743:30: error: missing field 'ordblks' initializer [-Werror,-Wmissing-field-initializers]
struct mallinfo info = {0};
^
Signed-off-by: Tad <tad@spotco.us>
67 lines
2.2 KiB
Diff
67 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Micay <danielmicay@gmail.com>
|
|
Date: Thu, 28 May 2020 20:19:14 -0400
|
|
Subject: [PATCH] workaround for audio service sorting bug
|
|
|
|
---
|
|
h_malloc.c | 15 ++++++++++++---
|
|
1 file changed, 12 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/h_malloc.c b/h_malloc.c
|
|
index 8d15ab2..dbedbd4 100644
|
|
--- a/h_malloc.c
|
|
+++ b/h_malloc.c
|
|
@@ -85,6 +85,7 @@ static union {
|
|
bool zero_on_free;
|
|
bool purge_slabs;
|
|
bool region_quarantine_protect;
|
|
+ bool slot_randomize;
|
|
};
|
|
char padding[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) {
|
|
- if (SLOT_RANDOMIZE) {
|
|
+ if (ro.slot_randomize) {
|
|
// randomize start location for linear search (uniform random choice is too slow)
|
|
unsigned random_index = get_random_u16_uniform(rng, slots);
|
|
unsigned first_bitmap = random_index / 64;
|
|
@@ -1061,17 +1062,24 @@ static inline void enforce_init(void) {
|
|
}
|
|
}
|
|
|
|
-COLD static void handle_hal_bugs(void) {
|
|
+COLD static void handle_bugs(void) {
|
|
char path[256];
|
|
if (readlink("/proc/self/exe", path, sizeof(path)) == -1) {
|
|
return;
|
|
}
|
|
+
|
|
const char camera_provider[] = "/vendor/bin/hw/android.hardware.camera.provider@2.4-service_64";
|
|
if (strcmp(camera_provider, path) == 0) {
|
|
ro.zero_on_free = false;
|
|
ro.purge_slabs = 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) {
|
|
@@ -1100,7 +1108,8 @@ COLD static void init_slow_path(void) {
|
|
ro.purge_slabs = true;
|
|
ro.zero_on_free = ZERO_ON_FREE;
|
|
ro.region_quarantine_protect = true;
|
|
- handle_hal_bugs();
|
|
+ ro.slot_randomize = SLOT_RANDOMIZE;
|
|
+ handle_bugs();
|
|
|
|
if (sysconf(_SC_PAGESIZE) != PAGE_SIZE) {
|
|
fatal_error("page size mismatch");
|