diff --git a/Patches/LineageOS-20.0/android_packages_apps_Updater/0003-Server_Choices.patch b/Patches/LineageOS-20.0/android_packages_apps_Updater/0003-Server_Choices.patch index 47806792..0dcd6924 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_Updater/0003-Server_Choices.patch +++ b/Patches/LineageOS-20.0/android_packages_apps_Updater/0003-Server_Choices.patch @@ -85,7 +85,7 @@ index 825e1a0..eac5451 100644 public static final String PREF_AUTO_DELETE_UPDATES = "auto_delete_updates"; public static final String PREF_AB_PERF_MODE = "ab_perf_mode"; diff --git a/app/src/main/java/org/lineageos/updater/misc/Utils.java b/app/src/main/java/org/lineageos/updater/misc/Utils.java -index 3d4aab9..28c8fe5 100644 +index 3d4aab9..e6a98a7 100644 --- a/app/src/main/java/org/lineageos/updater/misc/Utils.java +++ b/app/src/main/java/org/lineageos/updater/misc/Utils.java @@ -201,14 +201,33 @@ public class Utils { diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index 8aa33eca..4bcb4c1b 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -55,8 +55,8 @@ commentPatches android_kernel_google_bonito.sh "CVE-2020-0067"; commentPatches android_kernel_google_coral.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-30324"; commentPatches android_kernel_google_dragon.sh "0006-AndroidHardening-Kernel_Hardening/3.18/0026.patch" "0008-Graphene-Kernel_Hardening-ro" "CVE-2015-4167" "CVE-2017-15951" "CVE-2016-1237" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972" "CVE-2019-2214" "CVE-2021-39715/ANY/0001.patch"; commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067"; -commentPatches android_kernel_google_gs101_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch" "CVE-2023-6817/5.10/0002.patch" "CVE-2023-52462/5.10/0002.patch" "CVE-2024-26733/5.10/0002.patch" "CVE-2024-26882"; -commentPatches android_kernel_google_gs201_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch" "CVE-2023-6817/5.10/0002.patch" "CVE-2023-52462/5.10/0002.patch" "CVE-2024-26733/5.10/0002.patch" "CVE-2024-26882"; +commentPatches android_kernel_google_gs101_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch" "CVE-2023-6817/5.10/0002.patch" "CVE-2023-52462/5.10/0002.patch" "CVE-2023-52672" "CVE-2024-26733/5.10/0002.patch" "CVE-2024-26882"; +commentPatches android_kernel_google_gs201_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch" "CVE-2023-6817/5.10/0002.patch" "CVE-2023-52462/5.10/0002.patch" "CVE-2023-52672" "CVE-2024-26733/5.10/0002.patch" "CVE-2024-26882"; commentPatches android_kernel_google_marlin.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "0006-AndroidHardening-Kernel_Hardening/3.18/0048.patch" "0006-AndroidHardening-Kernel_Hardening/3.18/0049.patch" "0008-Graphene-Kernel_Hardening-canaries/4.4/0002.patch" "CVE-2017-13162/3.18/0001.patch" "CVE-2017-14883" "CVE-2017-15951" "CVE-2018-17972" "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_google_msm.sh "CVE-2017-11015/prima" "CVE-2021-Misc2/ANY/0031.patch"; commentPatches android_kernel_google_msm-4.9.sh "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-30324" "CVE-2021-45469"; 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 dc5f1caa..4125c0cc 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 @@ -287,7 +287,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52655/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52656/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52669/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52670/5.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52672/5.10/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52672/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52675/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52679/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52683/5.10/0003.patch 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 700009a9..c415a912 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 @@ -285,7 +285,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52655/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52656/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52669/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52670/5.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52672/5.10/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52672/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52675/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52679/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52683/5.10/0003.patch