diff --git a/Logs/resetWorkspace-LineageOS-20.0.txt b/Logs/resetWorkspace-LineageOS-20.0.txt index 1db74777..e05f778c 100644 --- a/Logs/resetWorkspace-LineageOS-20.0.txt +++ b/Logs/resetWorkspace-LineageOS-20.0.txt @@ -902,7 +902,7 @@ hardware/qcom-caf/sm8550/display d5f57380e8c920f851919c52599ec8ed81251bd5 hardware/qcom-caf/sm8550/media b87ee8e8658dd462a10a39e402ae1402308465dc hardware/qcom-caf/thermal 1b6692a6bda27fc27d97640f88281b61f093064d hardware/qcom-caf/vr d7c051add89a45090250c8f6c16c5c86f82be6b8 -hardware/qcom-caf/wlan 3206a1a7460f740c33e105f9c8baf7f01653de5f +hardware/qcom-caf/wlan b93dc5e7fcfeb2e89f593025d39386e77d5272bc hardware/qcom/audio 7f80cf1d4880f8946250dd20f158985123934fee hardware/qcom/bootctrl 42b3699fcbb77287b683ad6ecd788f2d763fd4b4 hardware/qcom/bt 79ece28f29bf9b49a6527daf3e50f80d31065243 diff --git a/Patches/Linux b/Patches/Linux index 5d16bf50..25dbfb51 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 5d16bf50ec6c5920ada39ae8b1a2c02aa59bb4f5 +Subproject commit 25dbfb517cc4b5863e06a7d19e9a6b077b43e307 diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index ef802e61..e39fc30f 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-2023-52672" "CVE-2024-26733/5.10/0002.patch" "CVE-2023-52656/5.10" "CVE-2024-26882" "CVE-2024-38564"; -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-2023-52656/5.10" "CVE-2024-26882" "CVE-2024-38564"; +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-2023-52656/5.10" "CVE-2024-26882" "CVE-2024-38564" "CVE-2022-48862"; +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-2023-52656/5.10" "CVE-2024-26882" "CVE-2024-38564" "CVE-2022-48862"; 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-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index 336dac6c..5ad1901b 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -66,9 +66,8 @@ patchWorkspaceReal() { verifyAllPlatformTags; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; - source build/envsetup.sh; + #source build/envsetup.sh; #repopick -ift twelve-bt-sbc-hd-dualchannel; - repopick -it S_asb_2024-07; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh index 031fe2fe..cdc4884e 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh @@ -355,7 +355,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39506/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39509/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40902/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40904/3.5-^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40912/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40917/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40923/^6.10/0001.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh index 9dbc0f91..ebd2e767 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh @@ -355,7 +355,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39506/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39509/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40902/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40904/3.5-^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40912/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40917/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40923/^6.10/0001.patch 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 674dab22..f3e892e9 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 @@ -91,7 +91,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48772/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48781/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48785/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48828/5.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48862/^5.17/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48862/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-OctWirelessASB/^5.15/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0045/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0160/5.10/0002.patch @@ -758,7 +758,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40902/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40904/3.5-^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40905/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40910/^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40912/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40917/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40923/^6.10/0001.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 ca991b79..c4b61e81 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 @@ -91,7 +91,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48772/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48781/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48785/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48828/5.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48862/^5.17/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48862/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-OctWirelessASB/^5.15/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0045/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0160/5.10/0002.patch @@ -756,7 +756,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40902/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40904/3.5-^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40905/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40910/^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40912/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40917/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40923/^6.10/0001.patch 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 309c88e8..bf87c002 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 @@ -556,7 +556,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39506/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39509/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40902/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40904/3.5-^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40912/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40917/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40923/^6.10/0001.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh index 58c8bbcc..654925aa 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh @@ -407,7 +407,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39506/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39509/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40902/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40904/3.5-^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40912/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40917/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40923/^6.10/0001.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh index e72ff978..2ad39e49 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh @@ -353,7 +353,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39506/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39509/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40902/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40904/3.5-^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40912/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40917/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40923/^6.10/0001.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8350.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8350.sh index 579673e5..c5991a62 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8350.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8350.sh @@ -410,7 +410,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40901/5.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40902/5.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40904/3.5-^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40905/5.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40912/5.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40917/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40923/^6.10/0001.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm8250.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm8250.sh index ab43d065..6023da33 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm8250.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm8250.sh @@ -238,7 +238,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39506/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39509/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40902/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40904/3.5-^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40911/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40912/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40917/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40923/^6.10/0001.patch diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index 7e9e8dcb..9286f878 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -162,8 +162,7 @@ patchWorkspaceReal() { verifyAllPlatformTags; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; - source build/envsetup.sh; - repopick -it T_asb_2024-07; + #source build/envsetup.sh; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";