Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2025-08-17 10:31:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Various dependency updates

Browse source 
- 14.1: update ffmpeg to @syphyr's latest
- 19.1: update SecureCamera to the latest
- 20.0: switch to latest hardened_malloc revision
- 14.1 through 19.1: pin vendor revisions

Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-05-06 12:19:21 -04:00
parent 8ce5a0e671
commit c26af5a755
No known key found for this signature in database
GPG key ID: E599F62ECBAEAF2E
15 changed files with 61 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Patches/LineageOS-20.0/android_build/0004-Selective_APEX.patch
View file

@ -10,7 +10,7 @@ Change-Id: Icffb72d8c3ed0e33e76538bb3427377c33c55ff9
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/target/product/generic_system.mk b/target/product/generic_system.mk
index 7f5f74f4b..aa7c02cdd 100644
index 7f5f74f4b..18c1aadc2 100644
--- a/target/product/generic_system.mk
+++ b/target/product/generic_system.mk
@@ -21,8 +21,10 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_default.mk)

36
Patches/LineageOS-20.0/android_external_hardened_malloc/0001-Broken_Cameras-1.patch
View file

@ -8,12 +8,12 @@ Subject: [PATCH] workarounds for Pixel 3 SoC era camera driver bugs
1 file changed, 28 insertions(+), 5 deletions(-)
diff --git a/h_malloc.c b/h_malloc.c
index 91eb6ca..824119b 100644
index 15be0a2..3fa9ed7 100644
--- a/h_malloc.c
+++ b/h_malloc.c
@@ -76,6 +76,9 @@ static union {
#ifdef USE_PKEY
int metadata_pkey;
@@ -80,6 +80,9 @@ static union {
#ifdef MEMTAG
bool is_memtag_disabled;
#endif
+ bool zero_on_free;
+ bool purge_slabs;
@ -21,7 +21,7 @@ index 91eb6ca..824119b 100644
};
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) {
@@ -465,7 +468,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) {
@ -30,16 +30,16 @@ index 91eb6ca..824119b 100644
return;
}
@@ -694,7 +697,7 @@ static inline void deallocate_small(void *p, const size_t *expected_size) {
if (likely(!is_zero_size)) {
check_canary(metadata, p, size);
@@ -812,7 +815,7 @@ static inline void deallocate_small(void *p, const size_t *expected_size) {
}
#endif
- if (ZERO_ON_FREE) {
+ if (ro.zero_on_free) {
- if (ZERO_ON_FREE && !skip_zero) {
+ if (ro.zero_on_free && !skip_zero) {
memset(p, 0, size - canary_size);
}
}
@@ -772,7 +775,7 @@ static inline void deallocate_small(void *p, const size_t *expected_size) {
@@ -890,7 +893,7 @@ static inline void deallocate_small(void *p, const size_t *expected_size) {
if (c->empty_slabs_total + slab_size > max_empty_slabs_total) {
int saved_errno = errno;
@ -48,7 +48,7 @@ index 91eb6ca..824119b 100644
label_slab(slab, slab_size, class);
stats_slab_deallocate(c, slab_size);
enqueue_free_slab(c, metadata);
@@ -858,7 +861,7 @@ static void regions_quarantine_deallocate_pages(void *p, size_t size, size_t gua
@@ -976,7 +979,7 @@ static void regions_quarantine_deallocate_pages(void *p, size_t size, size_t gua
return;
}
@ -57,7 +57,7 @@ index 91eb6ca..824119b 100644
memory_purge(p, size);
} else {
memory_set_name(p, size, "malloc large quarantine");
@@ -1074,6 +1077,21 @@ static inline void enforce_init(void) {
@@ -1192,6 +1195,21 @@ static inline void enforce_init(void) {
}
}
@ -76,10 +76,10 @@ index 91eb6ca..824119b 100644
+ }
+}
+
COLD static void init_slow_path(void) {
static struct mutex lock = MUTEX_INITIALIZER;
static struct mutex init_lock = MUTEX_INITIALIZER;
@@ -1088,6 +1106,11 @@ COLD static void init_slow_path(void) {
COLD static void init_slow_path(void) {
@@ -1207,6 +1225,11 @@ COLD static void init_slow_path(void) {
ro.metadata_pkey = pkey_alloc(0, 0);
#endif
@ -91,7 +91,7 @@ index 91eb6ca..824119b 100644
if (unlikely(sysconf(_SC_PAGESIZE) != PAGE_SIZE)) {
fatal_error("runtime page size does not match compile-time page size which is not supported");
}
@@ -1365,7 +1388,7 @@ EXPORT void *h_calloc(size_t nmemb, size_t size) {
@@ -1491,7 +1514,7 @@ EXPORT void *h_calloc(size_t nmemb, size_t size) {
}
total_size = adjust_size_for_canary(total_size);
void *p = alloc(total_size);
@ -99,4 +99,4 @@ index 91eb6ca..824119b 100644
+ 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;
#ifdef HAS_ARM_MTE

4
Patches/LineageOS-20.0/android_external_hardened_malloc/0001-Broken_Cameras-2.patch
View file

@ -10,10 +10,10 @@ Change-Id: I23513ec0379bbb10829f989690334e9704fd20e2
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/h_malloc.c b/h_malloc.c
index 824119b..bc6eb16 100644
index 3fa9ed7..0308d73 100644
--- a/h_malloc.c
+++ b/h_malloc.c
@@ -1085,7 +1085,8 @@ COLD static void handle_bugs(void) {
@@ -1203,7 +1203,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";

6
Patches/LineageOS-20.0/android_external_hardened_malloc/0002-Broken_Displays.patch
View file

@ -10,10 +10,10 @@ Signed-off-by: Tad <tad@spotco.us>
1 file changed, 9 insertions(+)
diff --git a/h_malloc.c b/h_malloc.c
index bc6eb16..7f76cad 100644
index 0308d73..6c3b148 100644
--- a/h_malloc.c
+++ b/h_malloc.c
@@ -1091,6 +1091,15 @@ COLD static void handle_bugs(void) {
@@ -1209,6 +1209,15 @@ COLD static void handle_bugs(void) {
ro.purge_slabs = false;
ro.region_quarantine_protect = false;
}
@ -28,4 +28,4 @@ index bc6eb16..7f76cad 100644
+ }
}
COLD static void init_slow_path(void) {
static struct mutex init_lock = MUTEX_INITIALIZER;

2
Patches/LineageOS-20.0/android_frameworks_base/0030-agnss.goog_override.patch
View file

@ -13,7 +13,7 @@ Signed-off-by: Tad <tad@spotco.us>
1 file changed, 35 insertions(+), 10 deletions(-)
diff --git a/services/core/java/com/android/server/location/gnss/GnssPsdsDownloader.java b/services/core/java/com/android/server/location/gnss/GnssPsdsDownloader.java
index 243910dd9541..f90c5b04abca 100644
index 243910dd9541..f111d5190340 100644
--- a/services/core/java/com/android/server/location/gnss/GnssPsdsDownloader.java
+++ b/services/core/java/com/android/server/location/gnss/GnssPsdsDownloader.java
@@ -18,6 +18,7 @@ package com.android.server.location.gnss;