From 7a53edc390673b1c697eb3d1d9541602bf44ca3f Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 10 Jul 2023 16:38:04 -0400 Subject: [PATCH] Churn Signed-off-by: Tad --- .../0029-Strict_Package_Checks-2.patch | 4 ++-- .../android_packages_modules_Wifi/0001-Random_MAC.patch | 4 ++-- .../LineageOS-20.0/android_packages_modules_Wifi/344228.patch | 4 ++-- .../android_kernel_google_gs101_private_gs-google.sh | 4 +--- .../android_kernel_google_gs201_private_gs-google.sh | 4 +--- .../CVE_Patchers/android_kernel_google_msm-4.14.sh | 4 +--- .../CVE_Patchers/android_kernel_google_redbull.sh | 4 +--- 7 files changed, 10 insertions(+), 18 deletions(-) diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0029-Strict_Package_Checks-2.patch b/Patches/LineageOS-20.0/android_frameworks_base/0029-Strict_Package_Checks-2.patch index 4dafbab0..68c64526 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0029-Strict_Package_Checks-2.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0029-Strict_Package_Checks-2.patch @@ -11,10 +11,10 @@ Subject: [PATCH] perform additional boot-time checks on system package updates create mode 100644 services/core/java/com/android/server/pm/PackageVerityExt.java diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java -index c32a57c68ede..d037e28f74fd 100644 +index 259701166147..6044961e8639 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java -@@ -3808,6 +3808,13 @@ final class InstallPackageHelper { +@@ -3824,6 +3824,13 @@ final class InstallPackageHelper { @Nullable UserHandle user) throws PackageManagerException { final boolean scanSystemPartition = (parseFlags & ParsingPackageUtils.PARSE_IS_SYSTEM_DIR) != 0; diff --git a/Patches/LineageOS-20.0/android_packages_modules_Wifi/0001-Random_MAC.patch b/Patches/LineageOS-20.0/android_packages_modules_Wifi/0001-Random_MAC.patch index 9041d255..429e80f9 100644 --- a/Patches/LineageOS-20.0/android_packages_modules_Wifi/0001-Random_MAC.patch +++ b/Patches/LineageOS-20.0/android_packages_modules_Wifi/0001-Random_MAC.patch @@ -63,7 +63,7 @@ index e988679fac..b7f4692198 100644 /** * Set the MAC randomization setting for this network. diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java -index ee6fea7ac8..5a6ab45179 100644 +index dca3e6b139..9c45521fde 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -467,6 +467,9 @@ public class WifiConfigManager { @@ -87,7 +87,7 @@ index ee6fea7ac8..5a6ab45179 100644 return config.getRandomizedMacAddress(); } diff --git a/service/java/com/android/server/wifi/WifiConfigurationUtil.java b/service/java/com/android/server/wifi/WifiConfigurationUtil.java -index 907ca721dd..d1c489f4b2 100644 +index 4a594b7a2a..9e8b660374 100644 --- a/service/java/com/android/server/wifi/WifiConfigurationUtil.java +++ b/service/java/com/android/server/wifi/WifiConfigurationUtil.java @@ -245,7 +245,7 @@ public class WifiConfigurationUtil { diff --git a/Patches/LineageOS-20.0/android_packages_modules_Wifi/344228.patch b/Patches/LineageOS-20.0/android_packages_modules_Wifi/344228.patch index 33a6f4f3..d39f8a73 100644 --- a/Patches/LineageOS-20.0/android_packages_modules_Wifi/344228.patch +++ b/Patches/LineageOS-20.0/android_packages_modules_Wifi/344228.patch @@ -19,10 +19,10 @@ Signed-off-by: penglezos 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java -index bd87041319..29855575e1 100644 +index 9ea75285d8..0ba938dcd7 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java -@@ -345,6 +345,8 @@ public class ClientModeImpl extends StateMachine implements ClientMode { +@@ -344,6 +344,8 @@ public class ClientModeImpl extends StateMachine implements ClientMode { private DetailedState mNetworkAgentState; private final SupplicantStateTracker mSupplicantStateTracker; diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh index f5587bfe..e560cc2b 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh @@ -61,7 +61,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/^5.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39189/5.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47929/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-OctWirelessASB/ANY/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0045/5.10/0004.patch @@ -108,7 +107,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3220/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3268/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3358/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3389/5.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-21255/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22998/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22998/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch @@ -132,7 +130,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35824/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35826/^6.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35828/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35829/5.10/0002.patch -editKernelLocalversion "-dos.p132" +editKernelLocalversion "-dos.p130" else echo "kernel_google_gs101_private_gs-google is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh index b8b7e3ca..ff7483c2 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh @@ -61,7 +61,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/^5.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39189/5.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47929/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-OctWirelessASB/ANY/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0045/5.10/0004.patch @@ -108,7 +107,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3220/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3268/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3358/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3389/5.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-21255/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22998/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22998/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch @@ -132,7 +130,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35824/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35826/^6.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35828/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35829/5.10/0002.patch -editKernelLocalversion "-dos.p132" +editKernelLocalversion "-dos.p130" else echo "kernel_google_gs201_private_gs-google is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh index 27f6fbad..b8e587ad 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh @@ -106,20 +106,18 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3141/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3161/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3358/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-21657/4.14/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22387/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23454/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-26545/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28328/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28541/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-30772/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-32269/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-34256/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35824/4.14/0003.patch -editKernelLocalversion "-dos.p119" +editKernelLocalversion "-dos.p117" else echo "kernel_google_msm-4.14 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh index beeaee7c..a6a7ffd4 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh @@ -79,7 +79,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20382/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47929/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0030/^4.20/0001.patch @@ -118,7 +117,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3220/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3358/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-21656/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22386/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-22387/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23454/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/4.19/0003.patch @@ -136,7 +134,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35788/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35823/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35824/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35828/4.19/0002.patch -editKernelLocalversion "-dos.p136" +editKernelLocalversion "-dos.p134" else echo "kernel_google_redbull is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE"