Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-10-01 01:35:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Churn + Fixes

Browse Source 
Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-06-19 23:57:56 -04:00
parent fcd8808b35
commit f1c027ecac
No known key found for this signature in database
GPG Key ID: E599F62ECBAEAF2E
15 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Logs/resetWorkspace-LineageOS-15.1.txt
View File

@ -68,7 +68,7 @@ external/caliper 4a0d9aba0856d0aa965d5653bfa4c138f0e8a8ba
external/cblas d063db8bdddfcde61e4bad3bfe65941fd73e8094
external/chromium-libpac 0ac78251d11006d764ba1aad8cc0867827fafe5c
external/chromium-trace 8b2c0074e71a8086dee98ca8730acfdc5eddf7a1
external/chromium-webview 18024297bc95fb233a92b15d8bf26c9b987bda66
external/chromium-webview ef62acbe255f65218a2122885a27624a0178ba14
external/clang 751a76679b0fb5798ea6cab75906df07edcab315
external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4
external/compiler-rt 0c46c9e892a3f68420635032ef2f6152dabd197c

2
Logs/resetWorkspace-LineageOS-16.0.txt
View File

@ -67,7 +67,7 @@ external/capstone 6788a4139092f179005f7cdbf181ba24b60b6113
external/cblas ddf5f49cb53866fbc503a6349bf44bac24a6963d
external/chromium-libpac dff5ddb8d28f6ac9a86eb28763b4313f6f72eec5
external/chromium-trace b2cf025c7d5cebd43084f38c6c7ff9cc17da428a
external/chromium-webview 18024297bc95fb233a92b15d8bf26c9b987bda66
external/chromium-webview ef62acbe255f65218a2122885a27624a0178ba14
external/clang f9d2af42fc6d74c28893af371e4647158eaba66c
external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4
external/cn-cbor 7fe9f01990a97be4df5e46d2decd894c06678072

8
Patches/LineageOS-15.1/android_frameworks_base/394878.patch
View File

@ -1,4 +1,4 @@
From 2d2a31353a07daf096aa9e2ca09e18ad2773b1ba Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dmitry Dementyev <dementyev@google.com>
Date: Tue, 26 Mar 2024 10:31:44 -0700
Subject: [PATCH] Add more checkKeyIntent checks to AccountManagerService.
@ -14,10 +14,10 @@ Change-Id: I9e45d758a2320328da5664b6341eafe6f285f297
1 file changed, 10 insertions(+)
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 4e4c261d0cc46..19e1a4c55120a 100644
index b06fce9128e6..45c56e41d7fb 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -3453,6 +3453,11 @@ public void onResult(Bundle result) {
@@ -3441,6 +3441,11 @@ public class AccountManagerService
// Strip auth token from result.
result.remove(AccountManager.KEY_AUTHTOKEN);
@ -29,7 +29,7 @@ index 4e4c261d0cc46..19e1a4c55120a 100644
if (Log.isLoggable(TAG, Log.VERBOSE)) {
Log.v(TAG,
@@ -5039,6 +5044,11 @@ public void onResult(Bundle result) {
@@ -5017,6 +5022,11 @@ public class AccountManagerService
} else {
if (mStripAuthTokenFromResult) {
result.remove(AccountManager.KEY_AUTHTOKEN);

6
Patches/LineageOS-15.1/android_frameworks_base/394879.patch
View File

@ -1,4 +1,4 @@
From a568a9144f1a804e4ac136522dfcd1f8aaae81a3 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chris Wailes <chriswailes@google.com>
Date: Thu, 18 Apr 2019 18:25:57 -0700
Subject: [PATCH] Adds additional sanitization for Zygote command arguments.
@ -18,7 +18,7 @@ Merged-In: I4055c50d52db0047c02c11096710fd07b429660c
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java
index 6994033a963a8..904ec46859fa4 100644
index 7a13ee89d393..d3eb9ae05fe4 100644
--- a/core/java/android/os/ZygoteProcess.java
+++ b/core/java/android/os/ZygoteProcess.java
@@ -16,6 +16,7 @@
@ -29,7 +29,7 @@ index 6994033a963a8..904ec46859fa4 100644
import android.net.LocalSocket;
import android.net.LocalSocketAddress;
import android.util.Log;
@@ -278,15 +279,19 @@ private static String getAbiList(BufferedWriter writer, DataInputStream inputStr
@@ -253,15 +254,19 @@ public class ZygoteProcess {
*/
@GuardedBy("mLock")
private static Process.ProcessStartResult zygoteSendArgsAndGetResult(

6
Patches/LineageOS-15.1/android_frameworks_base/394880.patch
View File

@ -1,4 +1,4 @@
From 00ff56bb646c525192f06cbeed96c3dc78d45795 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Hans Boehm <hboehm@google.com>
Date: Tue, 2 Jan 2024 16:53:13 -0800
Subject: [PATCH] Check hidden API exemptions
@ -18,10 +18,10 @@ Change-Id: I83cd60e46407a4a082f9f3c80e937dbd522dbac4
1 file changed, 2 insertions(+)
diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java
index 904ec46859fa4..aab1d9d578031 100644
index d3eb9ae05fe4..69d54b766d29 100644
--- a/core/java/android/os/ZygoteProcess.java
+++ b/core/java/android/os/ZygoteProcess.java
@@ -292,6 +292,8 @@ private static Process.ProcessStartResult zygoteSendArgsAndGetResult(
@@ -267,6 +267,8 @@ public class ZygoteProcess {
throw new ZygoteStartFailedEx("Embedded newlines not allowed");
} else if (args.get(i).indexOf('\r') >= 0) {
throw new ZygoteStartFailedEx("Embedded carriage returns not allowed");

8
Patches/LineageOS-15.1/android_frameworks_base/394882.patch
View File

@ -1,7 +1,7 @@
From 538cc6c384985f272dc7ab6c7cc7222a59b4c341 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Guojing Yuan <guojing@google.com>
Date: Thu, 14 Dec 2023 19:30:04 +0000
Subject: [PATCH] [BACKPORT] Check permissions for CDM shell commands
Subject: [PATCH] Check permissions for CDM shell commands
Override handleShellCommand instead of onShellCommand because
Binder.onShellCommand checks the necessary permissions of the caller.
@ -23,10 +23,10 @@ Change-Id: I5539b3594feb5544c458c0fd1061b51a0a808900
1 file changed, 5 insertions(+)
diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
index 087fe8560fc80..8ffb53f8a3b9d 100644
index a5c9f67060d7..355fc5cd1c8f 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -345,6 +345,11 @@ private void checkUsesFeature(String pkg, int userId) {
@@ -348,6 +348,11 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err,
String[] args, ShellCallback callback, ResultReceiver resultReceiver)
throws RemoteException {

16
Patches/LineageOS-16.0/android_frameworks_base/394877.patch
View File

@ -1,8 +1,8 @@
From 361c828f654b646f968644dbadf8a1f5f8ad67d8 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Valentin Iftime <valiiftime@google.com>
Date: Thu, 1 Feb 2024 13:58:49 +0100
Subject: [PATCH] [BACKPORT] Verify URI permission for channel sound update
from NotificationListenerService
Subject: [PATCH] Verify URI permission for channel sound update from
NotificationListenerService
Check that a privileged NotificationListenerService (CDM) has the permission to access the sound URI
when updating a notification channel.
@ -19,10 +19,10 @@ Change-Id: Ic7d2e96e43565e98d2aa29b8f2ba35c142387ba9
2 files changed, 79 insertions(+)
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index a1e8cd15fd7ee..e793dc024156a 100755
index a1e8cd15fd7e..e793dc024156 100755
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -3668,6 +3668,10 @@ public void updateNotificationChannelFromPrivilegedListener(INotificationListene
@@ -3668,6 +3668,10 @@ public class NotificationManagerService extends SystemService {
Preconditions.checkNotNull(user);
verifyPrivilegedListener(token, user);
@ -33,7 +33,7 @@ index a1e8cd15fd7ee..e793dc024156a 100755
updateNotificationChannelInt(pkg, getUidForPackageAndUser(pkg, user), channel, true);
}
@@ -3709,6 +3713,24 @@ private void verifyPrivilegedListener(INotificationListener token, UserHandle us
@@ -3709,6 +3713,24 @@ public class NotificationManagerService extends SystemService {
}
}
@ -59,10 +59,10 @@ index a1e8cd15fd7ee..e793dc024156a 100755
int uid = 0;
long identity = Binder.clearCallingIdentity();
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
index 379290bcf0ad0..db83d8f1a4f07 100644
index 379290bcf0ad..db83d8f1a4f0 100644
--- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
@@ -1681,6 +1681,63 @@ public void testUpdateNotificationChannelFromPrivilegedListener_badUser() throws
@@ -1681,6 +1681,63 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED));
}

8
Patches/LineageOS-16.0/android_frameworks_base/394878.patch
View File

@ -1,4 +1,4 @@
From 2d2a31353a07daf096aa9e2ca09e18ad2773b1ba Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dmitry Dementyev <dementyev@google.com>
Date: Tue, 26 Mar 2024 10:31:44 -0700
Subject: [PATCH] Add more checkKeyIntent checks to AccountManagerService.
@ -14,10 +14,10 @@ Change-Id: I9e45d758a2320328da5664b6341eafe6f285f297
1 file changed, 10 insertions(+)
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 4e4c261d0cc46..19e1a4c55120a 100644
index 4e4c261d0cc4..19e1a4c55120 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -3453,6 +3453,11 @@ public void onResult(Bundle result) {
@@ -3453,6 +3453,11 @@ public class AccountManagerService
// Strip auth token from result.
result.remove(AccountManager.KEY_AUTHTOKEN);
@ -29,7 +29,7 @@ index 4e4c261d0cc46..19e1a4c55120a 100644
if (Log.isLoggable(TAG, Log.VERBOSE)) {
Log.v(TAG,
@@ -5039,6 +5044,11 @@ public void onResult(Bundle result) {
@@ -5039,6 +5044,11 @@ public class AccountManagerService
} else {
if (mStripAuthTokenFromResult) {
result.remove(AccountManager.KEY_AUTHTOKEN);

6
Patches/LineageOS-16.0/android_frameworks_base/394879.patch
View File

@ -1,4 +1,4 @@
From a568a9144f1a804e4ac136522dfcd1f8aaae81a3 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Chris Wailes <chriswailes@google.com>
Date: Thu, 18 Apr 2019 18:25:57 -0700
Subject: [PATCH] Adds additional sanitization for Zygote command arguments.
@ -18,7 +18,7 @@ Merged-In: I4055c50d52db0047c02c11096710fd07b429660c
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java
index 6994033a963a8..904ec46859fa4 100644
index 6994033a963a..904ec46859fa 100644
--- a/core/java/android/os/ZygoteProcess.java
+++ b/core/java/android/os/ZygoteProcess.java
@@ -16,6 +16,7 @@
@ -29,7 +29,7 @@ index 6994033a963a8..904ec46859fa4 100644
import android.net.LocalSocket;
import android.net.LocalSocketAddress;
import android.util.Log;
@@ -278,15 +279,19 @@ private static String getAbiList(BufferedWriter writer, DataInputStream inputStr
@@ -278,15 +279,19 @@ public class ZygoteProcess {
*/
@GuardedBy("mLock")
private static Process.ProcessStartResult zygoteSendArgsAndGetResult(

6
Patches/LineageOS-16.0/android_frameworks_base/394880.patch
View File

@ -1,4 +1,4 @@
From 00ff56bb646c525192f06cbeed96c3dc78d45795 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Hans Boehm <hboehm@google.com>
Date: Tue, 2 Jan 2024 16:53:13 -0800
Subject: [PATCH] Check hidden API exemptions
@ -18,10 +18,10 @@ Change-Id: I83cd60e46407a4a082f9f3c80e937dbd522dbac4
1 file changed, 2 insertions(+)
diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java
index 904ec46859fa4..aab1d9d578031 100644
index 904ec46859fa..aab1d9d57803 100644
--- a/core/java/android/os/ZygoteProcess.java
+++ b/core/java/android/os/ZygoteProcess.java
@@ -292,6 +292,8 @@ private static Process.ProcessStartResult zygoteSendArgsAndGetResult(
@@ -292,6 +292,8 @@ public class ZygoteProcess {
throw new ZygoteStartFailedEx("Embedded newlines not allowed");
} else if (args.get(i).indexOf('\r') >= 0) {
throw new ZygoteStartFailedEx("Embedded carriage returns not allowed");

8
Patches/LineageOS-16.0/android_frameworks_base/394881.patch
View File

@ -1,4 +1,4 @@
From a73947c4826f59babc2368754e478942eb9b28a1 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ameer Armaly <aarmaly@google.com>
Date: Fri, 8 Mar 2024 19:41:06 +0000
Subject: [PATCH] AccessibilityManagerService: remove uninstalled services from
@ -14,10 +14,10 @@ Change-Id: I5e59296fcad68e62b34c74ee5fd80b6ad6b46fa1
1 file changed, 23 insertions(+)
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
index fd87be3e5649f..39ac2f3c1bdbf 100644
index fd87be3e5649..39ac2f3c1bdb 100644
--- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -1553,10 +1553,13 @@ private void updateServicesLocked(UserState userState) {
@@ -1553,10 +1553,13 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
boolean isUnlockingOrUnlocked = LocalServices.getService(UserManagerInternal.class)
.isUserUnlockingOrUnlocked(userState.mUserId);
@ -31,7 +31,7 @@ index fd87be3e5649f..39ac2f3c1bdbf 100644
AccessibilityServiceConnection service = componentNameToServiceMap.get(componentName);
@@ -1602,6 +1605,26 @@ private void updateServicesLocked(UserState userState) {
@@ -1602,6 +1605,26 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
if (audioManager != null) {
audioManager.setAccessibilityServiceUids(mTempIntArray);
}

8
Patches/LineageOS-16.0/android_frameworks_base/394882.patch
View File

@ -1,7 +1,7 @@
From 538cc6c384985f272dc7ab6c7cc7222a59b4c341 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Guojing Yuan <guojing@google.com>
Date: Thu, 14 Dec 2023 19:30:04 +0000
Subject: [PATCH] [BACKPORT] Check permissions for CDM shell commands
Subject: [PATCH] Check permissions for CDM shell commands
Override handleShellCommand instead of onShellCommand because
Binder.onShellCommand checks the necessary permissions of the caller.
@ -23,10 +23,10 @@ Change-Id: I5539b3594feb5544c458c0fd1061b51a0a808900
1 file changed, 5 insertions(+)
diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
index 087fe8560fc80..8ffb53f8a3b9d 100644
index 087fe8560fc8..8ffb53f8a3b9 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -345,6 +345,11 @@ private void checkUsesFeature(String pkg, int userId) {
@@ -345,6 +345,11 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err,
String[] args, ShellCallback callback, ResultReceiver resultReceiver)
throws RemoteException {

2
Scripts/Common/Fix_CVE_Patchers.sh
View File

@ -105,7 +105,7 @@ commentPatches android_kernel_xiaomi_sdm660.sh "0008-Graphene-Kernel_Hardening-c
commentPatches android_kernel_xiaomi_sm8150.sh "CVE-2020-24588/4.14/0018.patch";
commentPatches android_kernel_xiaomi_vayu.sh "CVE-2020-24588/4.14/0018.patch";
commentPatches android_kernel_xiaomi_sm8250.sh "CVE-2018-5873" "CVE-2020-1749" "CVE-2021-3444" "CVE-2021-3600" "CVE-2022-22075";
commentPatches android_kernel_yandex_sdm660.sh "CVE-2019-11599" "CVE-2019-14070/ANY/0005.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166";
commentPatches android_kernel_yandex_sdm660.sh "CVE-2019-11599" "CVE-2019-14070/ANY/0005.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166" "CVE-2024-35954";
commentPatches android_kernel_zte_msm8930.sh "CVE-2015-2922" "CVE-2017-11015/prima";
commentPatches android_kernel_zte_msm8996.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "CVE-2017-13162" "CVE-2017-15951" "CVE-2017-16939" "CVE-2018-17972" "CVE-2019-2214" "CVE-2019-14070" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166" "CVE-2021-39715/ANY/0001.patch" "CVE-2022-42896/4.9";
commentPatches android_kernel_zuk_msm8996.sh "0008-Graphene-Kernel_Hardening-slab" "0008-Graphene-Kernel_Hardening-canaries/4.4/0002.patch" "CVE-2019-19319" "CVE-2020-0305" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-1616";

3
Scripts/LineageOS-15.1/Functions.sh
View File

@ -62,9 +62,10 @@ buildAll() {
#Intel
buildDevice fugu;
#Tegra
buildDevice dragon verity;
cd "$DOS_BUILD_BASE/bionic" && git apply --reverse "$DOS_PATCHES/android_bionic/0001-HM-Use_HM.patch" && cd "$DOS_BUILD_BASE";
buildDevice flounder verity;
buildDevice flounder_lte verity;
buildDevice dragon verity;
}
export -f buildAll;

2
Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh
View File

@ -741,7 +741,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35935/4.4/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35936/4.4/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35944/4.4/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35947/^6.9/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35954/^6.9/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35954/^6.9/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35962/^6.9/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35969/4.4/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35982/4.4/0001.patch