From c9765fc883bdf76d87ee7a53b4731d78c6c03971 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 16 Mar 2022 18:38:30 -0400 Subject: [PATCH] Tweak tweak Signed-off-by: Tad --- .../0002-Broken_Cameras.patch | 14 +++++++------- .../0001-Broken_Cameras.patch | 14 +++++++------- .../0001-Broken_Cameras.patch | 17 ++++++++--------- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/Patches/LineageOS-16.0/android_external_hardened_malloc/0002-Broken_Cameras.patch b/Patches/LineageOS-16.0/android_external_hardened_malloc/0002-Broken_Cameras.patch index 7049d433..db6c60a2 100644 --- a/Patches/LineageOS-16.0/android_external_hardened_malloc/0002-Broken_Cameras.patch +++ b/Patches/LineageOS-16.0/android_external_hardened_malloc/0002-Broken_Cameras.patch @@ -4,22 +4,22 @@ Date: Tue, 15 Mar 2022 22:18:26 -0400 Subject: [PATCH] Expand workaround to all camera executables Signed-off-by: Tad +Change-Id: I23513ec0379bbb10829f989690334e9704fd20e2 --- - h_malloc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + h_malloc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/h_malloc.c b/h_malloc.c -index dbedbd4..ebf5d76 100644 +index de693c9..f680fa6 100644 --- a/h_malloc.c +++ b/h_malloc.c -@@ -1068,8 +1068,8 @@ COLD static void handle_bugs(void) { - return; +@@ -1058,7 +1058,8 @@ COLD static void handle_bugs(void) { } -- 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) { + // Any camera executable on system partition -+ if (strstr(path, "camera") != NULL && (strncmp("/system", path, 7) == 0 || strncmp("/vendor", path, 7) == 0)) { ++ if (strcmp(camera_provider, path) == 0 || (strstr(path, "camera") != NULL && (strncmp("/system", path, 7) == 0 || strncmp("/vendor", path, 7) == 0))) { ro.zero_on_free = false; ro.purge_slabs = false; ro.region_quarantine_protect = false; diff --git a/Patches/LineageOS-17.1/android_external_hardened_malloc/0001-Broken_Cameras.patch b/Patches/LineageOS-17.1/android_external_hardened_malloc/0001-Broken_Cameras.patch index e5f198f2..db6c60a2 100644 --- a/Patches/LineageOS-17.1/android_external_hardened_malloc/0001-Broken_Cameras.patch +++ b/Patches/LineageOS-17.1/android_external_hardened_malloc/0001-Broken_Cameras.patch @@ -4,22 +4,22 @@ Date: Tue, 15 Mar 2022 22:18:26 -0400 Subject: [PATCH] Expand workaround to all camera executables Signed-off-by: Tad +Change-Id: I23513ec0379bbb10829f989690334e9704fd20e2 --- - h_malloc.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + h_malloc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/h_malloc.c b/h_malloc.c -index de693c9..95a6ba3 100644 +index de693c9..f680fa6 100644 --- a/h_malloc.c +++ b/h_malloc.c -@@ -1057,8 +1057,8 @@ COLD static void handle_bugs(void) { - return; +@@ -1058,7 +1058,8 @@ COLD static void handle_bugs(void) { } -- 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) { + // Any camera executable on system partition -+ if (strstr(path, "camera") != NULL && (strncmp("/system", path, 7) == 0 || strncmp("/vendor", path, 7) == 0)) { ++ if (strcmp(camera_provider, path) == 0 || (strstr(path, "camera") != NULL && (strncmp("/system", path, 7) == 0 || strncmp("/vendor", path, 7) == 0))) { ro.zero_on_free = false; ro.purge_slabs = false; ro.region_quarantine_protect = false; diff --git a/Patches/LineageOS-18.1/android_external_hardened_malloc/0001-Broken_Cameras.patch b/Patches/LineageOS-18.1/android_external_hardened_malloc/0001-Broken_Cameras.patch index 58af8b96..34a710ec 100644 --- a/Patches/LineageOS-18.1/android_external_hardened_malloc/0001-Broken_Cameras.patch +++ b/Patches/LineageOS-18.1/android_external_hardened_malloc/0001-Broken_Cameras.patch @@ -4,23 +4,22 @@ Date: Tue, 15 Mar 2022 22:18:26 -0400 Subject: [PATCH] Expand workaround to all camera executables Signed-off-by: Tad +Change-Id: I23513ec0379bbb10829f989690334e9704fd20e2 --- - h_malloc.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) + h_malloc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/h_malloc.c b/h_malloc.c -index a6e1a7c..662af35 100644 +index a6e1a7c..1b574e4 100644 --- a/h_malloc.c +++ b/h_malloc.c -@@ -1068,9 +1068,8 @@ COLD static void handle_bugs(void) { - return; - } +@@ -1070,7 +1070,8 @@ COLD static void handle_bugs(void) { -- // 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"; + // 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) { + // Any camera executable on system partition -+ if (strstr(path, "camera") != NULL && (strncmp("/system", path, 7) == 0 || strncmp("/vendor", path, 7) == 0)) { ++ if (strcmp(camera_provider, path) == 0 || (strstr(path, "camera") != NULL && (strncmp("/system", path, 7) == 0 || strncmp("/vendor", path, 7) == 0))) { ro.zero_on_free = false; ro.purge_slabs = false; ro.region_quarantine_protect = false;