From 63829126db071bbe47c841e4178d859570028e2d Mon Sep 17 00:00:00 2001 From: Tavi Date: Wed, 7 Aug 2024 14:24:05 -0400 Subject: [PATCH] Fixup Signed-off-by: Tavi --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_yandex_sdm660.sh | 2 +- .../LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh | 2 +- .../CVE_Patchers/android_kernel_xiaomi_sdm660.sh | 2 +- .../CVE_Patchers/android_kernel_essential_msm8998.sh | 2 +- .../CVE_Patchers/android_kernel_fxtec_msm8998.sh | 2 +- .../android_kernel_google_gs101_private_gs-google.sh | 5 +++-- .../android_kernel_google_gs201_private_gs-google.sh | 5 +++-- .../CVE_Patchers/android_kernel_google_wahoo.sh | 2 +- .../CVE_Patchers/android_kernel_lge_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_msm8998.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm8350.sh | 2 +- .../CVE_Patchers/android_kernel_razer_msm8998.sh | 2 +- .../CVE_Patchers/android_kernel_sony_sdm660.sh | 2 +- .../CVE_Patchers/android_kernel_zuk_msm8996.sh | 2 +- 15 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 02711463..866eb5c3 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 027114633051528c2980ed7a503edf70f0eeb093 +Subproject commit 866eb5c3af743b6196fbac76fa21bb31811e675e diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh index 32e23fc4..c8caa01e 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh @@ -832,7 +832,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40981/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40984/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40987/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40988/4.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh index 06b7e8ea..e9ed59c5 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh @@ -538,7 +538,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40954/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40968/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40974/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40981/4.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41017/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41020/4.4/0008.patch diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh index c2ffb136..7137e97d 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh @@ -474,7 +474,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40981/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40984/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40987/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40988/4.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_essential_msm8998.sh index 532e7171..a764e18d 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_essential_msm8998.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_essential_msm8998.sh @@ -500,7 +500,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40984/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40987/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40988/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40996/^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh index 396d8b85..4f2e0c8f 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh @@ -451,7 +451,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40984/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40987/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40988/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40996/^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^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 3bdc757a..846fa524 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 @@ -797,8 +797,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41000/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41004/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41005/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41009/5.10/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/5.10/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/5.10/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/5.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch @@ -867,7 +868,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35812/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/5.10/0003.patch -editKernelLocalversion "-dos.p867" +editKernelLocalversion "-dos.p868" 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 a3f9c581..4ed7da4a 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 @@ -795,8 +795,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41000/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41004/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41005/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41009/5.10/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/5.10/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/5.10/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/5.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch @@ -865,7 +866,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35812/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/5.10/0003.patch -editKernelLocalversion "-dos.p865" +editKernelLocalversion "-dos.p866" 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_wahoo.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_wahoo.sh index 520f8f9d..1274c94f 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_wahoo.sh @@ -468,7 +468,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40984/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40987/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40988/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40996/^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_lge_msm8996.sh index a80117ee..c0420b4e 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -451,7 +451,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40984/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40987/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40988/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40996/^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_msm8998.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_msm8998.sh index 14684395..5c410bc7 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_msm8998.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_msm8998.sh @@ -455,7 +455,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40984/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40987/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40988/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40996/^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^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 85a2e75a..df1bdb1e 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 @@ -443,7 +443,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40988/5.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40993/^6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40996/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41006/5.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/5.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/5.4/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/5.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_msm8998.sh index d8e43f2b..4614d86b 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_msm8998.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_msm8998.sh @@ -451,7 +451,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40984/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40987/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40988/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40996/^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm660.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm660.sh index e019bd1e..ebf9f11d 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm660.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm660.sh @@ -468,7 +468,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40984/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40987/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40988/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40996/^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_zuk_msm8996.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_zuk_msm8996.sh index 70738757..afe64529 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_zuk_msm8996.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_zuk_msm8996.sh @@ -466,7 +466,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40984/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40987/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40988/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40996/^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/4.4/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch