diff --git a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml index 52ad2e84..b01f9b23 100644 --- a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml +++ b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml @@ -242,6 +242,8 @@ com.qualcomm.qti.cne com.shannon.imsservice + + com.android.location.fused org.fitchfamily.android.dejavu diff --git a/Patches/LineageOS-19.1/android_external_hardened_malloc/0001-Broken_Cameras-1.patch b/Patches/LineageOS-19.1/android_external_hardened_malloc/0001-Broken_Cameras-1.patch new file mode 100644 index 00000000..8982c668 --- /dev/null +++ b/Patches/LineageOS-19.1/android_external_hardened_malloc/0001-Broken_Cameras-1.patch @@ -0,0 +1,102 @@ +From 0537fbb546866038d54b49cabeee8135be19f30f Mon Sep 17 00:00:00 2001 +From: Daniel Micay +Date: Tue, 1 Jan 2019 14:45:27 -0500 +Subject: [PATCH] workarounds for Pixel 3 SoC era camera driver bugs + +--- + h_malloc.c | 33 ++++++++++++++++++++++++++++----- + 1 file changed, 28 insertions(+), 5 deletions(-) + +diff --git a/h_malloc.c b/h_malloc.c +index 39ba84df..5fceaef6 100644 +--- a/h_malloc.c ++++ b/h_malloc.c +@@ -76,6 +76,9 @@ static union { + #ifdef USE_PKEY + int metadata_pkey; + #endif ++ bool zero_on_free; ++ bool purge_slabs; ++ bool region_quarantine_protect; + }; + char padding[PAGE_SIZE]; + } ro __attribute__((aligned(PAGE_SIZE))); +@@ -443,7 +446,7 @@ static void *slot_pointer(size_t size, void *slab, size_t slot) { + } + + static void write_after_free_check(const char *p, size_t size) { +- if (!WRITE_AFTER_FREE_CHECK) { ++ if (!WRITE_AFTER_FREE_CHECK || !ro.zero_on_free) { + return; + } + +@@ -693,7 +696,7 @@ static inline void deallocate_small(void *p, const size_t *expected_size) { + if (likely(!is_zero_size)) { + check_canary(metadata, p, size); + +- if (ZERO_ON_FREE) { ++ if (ro.zero_on_free) { + memset(p, 0, size - canary_size); + } + } +@@ -770,7 +773,7 @@ static inline void deallocate_small(void *p, const size_t *expected_size) { + metadata->prev = NULL; + + if (c->empty_slabs_total + slab_size > max_empty_slabs_total) { +- if (!memory_map_fixed(slab, slab_size)) { ++ if (ro.purge_slabs && !memory_map_fixed(slab, slab_size)) { + label_slab(slab, slab_size, class); + stats_slab_deallocate(c, slab_size); + enqueue_free_slab(c, metadata); +@@ -855,7 +858,7 @@ static void regions_quarantine_deallocate_pages(void *p, size_t size, size_t gua + return; + } + +- if (unlikely(memory_map_fixed(p, size))) { ++ if (!ro.region_quarantine_protect || unlikely(memory_map_fixed(p, size))) { + memory_purge(p, size); + } else { + memory_set_name(p, size, "malloc large quarantine"); +@@ -1071,6 +1074,21 @@ static inline void enforce_init(void) { + } + } + ++COLD static void handle_bugs(void) { ++ char path[256]; ++ if (readlink("/proc/self/exe", path, sizeof(path)) == -1) { ++ return; ++ } ++ ++ // Pixel 3, Pixel 3 XL, Pixel 3a and Pixel 3a XL camera provider ++ 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; ++ } ++} ++ + COLD static void init_slow_path(void) { + static struct mutex lock = MUTEX_INITIALIZER; + +@@ -1085,6 +1103,11 @@ COLD static void init_slow_path(void) { + ro.metadata_pkey = pkey_alloc(0, 0); + #endif + ++ ro.purge_slabs = true; ++ ro.zero_on_free = ZERO_ON_FREE; ++ ro.region_quarantine_protect = true; ++ handle_bugs(); ++ + if (unlikely(sysconf(_SC_PAGESIZE) != PAGE_SIZE)) { + fatal_error("runtime page size does not match compile-time page size which is not supported"); + } +@@ -1360,7 +1383,7 @@ EXPORT void *h_calloc(size_t nmemb, size_t size) { + } + total_size = adjust_size_for_canary(total_size); + void *p = alloc(total_size); +- if (!ZERO_ON_FREE && likely(p != NULL) && total_size && total_size <= max_slab_size_class) { ++ if (!ro.zero_on_free && likely(p != NULL) && total_size && total_size <= max_slab_size_class) { + memset(p, 0, total_size - canary_size); + } + return p; diff --git a/Patches/LineageOS-19.1/android_external_hardened_malloc/0001-Broken_Cameras.patch b/Patches/LineageOS-19.1/android_external_hardened_malloc/0001-Broken_Cameras-2.patch similarity index 100% rename from Patches/LineageOS-19.1/android_external_hardened_malloc/0001-Broken_Cameras.patch rename to Patches/LineageOS-19.1/android_external_hardened_malloc/0001-Broken_Cameras-2.patch diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh index 680b0907..a58bd91a 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -115,7 +115,8 @@ fi; if [ "$DOS_GRAPHENE_MALLOC" = true ]; then if enterAndClear "external/hardened_malloc"; then -applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras.patch"; #Expand workaround to all camera executables (DivestOS) +applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS) +applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS) fi; fi;