diff --git a/Patches/Linux b/Patches/Linux index 610296a4..4dacd4ae 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 610296a4e6ed4d18a4a62c604245d477401712fd +Subproject commit 4dacd4aea093d8317ac7e5818d874ec1b9c9d3d8 diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index b2a21e1d..2040c0e2 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"; -commentPatches android_kernel_google_gs201_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch"; +commentPatches android_kernel_google_gs101_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch" "CVE-2023-52462/5.10/0002.patch"; +commentPatches android_kernel_google_gs201_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch" "CVE-2023-52462/5.10/0002.patch"; 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_fairphone_sm7225.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh index 7a61c3b3..539187c3 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 @@ -88,7 +88,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28553/qca-wifi-host-cmn/0001.patch -- git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31083/^6.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52435/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52437/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52462/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0607/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-1086/4.19/0002.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 15577320..a616724a 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 @@ -88,7 +88,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28553/qca-wifi-host-cmn/0001.patch -- git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31083/^6.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52435/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52437/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52462/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0607/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-1086/4.19/0002.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 b7609b5c..d4d78edd 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 @@ -211,7 +211,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52448/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52449/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52454/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52456/5.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52462/5.10/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52462/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52463/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52464/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52467/5.10/0002.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 be369685..a0c6bcac 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 @@ -209,7 +209,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52448/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52449/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52454/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52456/5.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52462/5.10/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52462/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52463/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52464/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52467/5.10/0002.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 3d6165e9..70032ae0 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 @@ -220,7 +220,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52443/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52444/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52445/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52449/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52462/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52464/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52469/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52470/4.19/0002.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 ed775b32..6e8201c8 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 @@ -99,7 +99,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52443/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52444/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52445/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52449/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52462/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52464/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52469/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52470/4.19/0002.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 94dabf44..c0c15201 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 @@ -86,7 +86,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28553/qca-wifi-host-cmn/0001.patch -- git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31083/^6.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52435/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52437/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52462/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0607/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-1086/4.19/0002.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 3918016b..e88552f0 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 @@ -42,7 +42,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35826/^6.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-47233/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52435/5.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52437/5.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52462/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/5.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0607/5.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-1086/5.4/0005.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 0a5a498f..e6274b75 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 @@ -152,7 +152,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52443/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52444/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52445/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52449/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52462/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52464/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52469/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52470/4.19/0002.patch