From 570d2edfee96835b8baaf4af04e41e055bf514cc Mon Sep 17 00:00:00 2001 From: Tavi Date: Wed, 10 Apr 2024 08:16:01 -0400 Subject: [PATCH] Update CVE patchers Signed-off-by: Tavi --- Patches/Linux | 2 +- .../LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh | 2 +- .../LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh | 2 +- .../CVE_Patchers/android_kernel_fairphone_sm7225.sh | 2 +- .../LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh | 2 +- .../android_kernel_google_gs101_private_gs-google.sh | 1 + .../android_kernel_google_gs201_private_gs-google.sh | 1 + .../CVE_Patchers/android_kernel_google_msm-4.14.sh | 2 +- .../CVE_Patchers/android_kernel_google_redbull.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm7250.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm8250.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm8350.sh | 2 +- .../LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm6150.sh | 2 +- .../LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm8250.sh | 2 +- .../LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh | 2 +- 16 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index c3f6f963..b34ec3a4 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit c3f6f9630e168a421f79c67b1a024c8914198f99 +Subproject commit b34ec3a4933c41dfeec1be8bd8f057f1f44e172c diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh index bb5c23c3..61ffb3d0 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh @@ -558,7 +558,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26791/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26793/^6.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26805/^6.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p559" +editKernelLocalversion "-dos.p558" else echo "kernel_xiaomi_sm6150 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh index a1d5b445..85a03d77 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh @@ -650,7 +650,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch -editKernelLocalversion "-dos.p651" +editKernelLocalversion "-dos.p650" else echo "kernel_xiaomi_sm8150 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" 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 bb9bdcf6..85c10b98 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 @@ -160,7 +160,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26793/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26801/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26805/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52601/4.19/0002.patch -editKernelLocalversion "-dos.p161" +editKernelLocalversion "-dos.p160" else echo "kernel_fairphone_sm7225 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" 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 faf32cbe..4f96c693 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 @@ -160,7 +160,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26793/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26801/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26805/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52601/4.19/0002.patch -editKernelLocalversion "-dos.p161" +editKernelLocalversion "-dos.p160" else echo "kernel_fxtec_sm6115 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" 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 59a11c04..fb124839 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 @@ -358,6 +358,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26793/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26795/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26801/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26805/5.10/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26814/^6.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52601/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26750/^6.8/0001.patch editKernelLocalversion "-dos.p361" 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 9efbf615..af24bb37 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 @@ -356,6 +356,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26793/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26795/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26801/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26805/5.10/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26814/^6.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52601/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26750/^6.8/0001.patch editKernelLocalversion "-dos.p359" 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 d63d3f2c..6e9aa5d6 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 @@ -126,7 +126,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26778/^6.7/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26791/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26793/^6.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26805/^6.8/0001.patch -editKernelLocalversion "-dos.p127" +editKernelLocalversion "-dos.p126" 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 6181259a..9b74a90e 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 @@ -307,7 +307,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26793/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26801/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26805/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52601/4.19/0002.patch -editKernelLocalversion "-dos.p308" +editKernelLocalversion "-dos.p307" else echo "kernel_google_redbull is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" 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 ff62a314..cf87fe52 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 @@ -179,7 +179,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26793/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26801/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26805/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52601/4.19/0002.patch -editKernelLocalversion "-dos.p180" +editKernelLocalversion "-dos.p179" else echo "kernel_oneplus_sm7250 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh index 3692fc3c..57211f34 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh @@ -616,7 +616,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26805/^6.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch -editKernelLocalversion "-dos.p617" +editKernelLocalversion "-dos.p616" else echo "kernel_oneplus_sm8150 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" 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 d313944f..83320a66 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 @@ -158,7 +158,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26793/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26801/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26805/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52601/4.19/0002.patch -editKernelLocalversion "-dos.p159" +editKernelLocalversion "-dos.p158" else echo "kernel_oneplus_sm8250 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" 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 3a20a625..f831d6ac 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 @@ -136,7 +136,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26804/5.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26805/5.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52601/5.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26750/^6.8/0001.patch -editKernelLocalversion "-dos.p137" +editKernelLocalversion "-dos.p136" else echo "kernel_oneplus_sm8350 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm6150.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm6150.sh index dcb0a05e..4a95043e 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm6150.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm6150.sh @@ -136,7 +136,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26778/^6.7/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26791/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26793/^6.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26805/^6.8/0001.patch -editKernelLocalversion "-dos.p137" +editKernelLocalversion "-dos.p136" else echo "kernel_xiaomi_sm6150 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" 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 5b050837..274d05b9 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 @@ -160,7 +160,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26793/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26801/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26805/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52601/4.19/0002.patch -editKernelLocalversion "-dos.p161" +editKernelLocalversion "-dos.p160" else echo "kernel_xiaomi_sm8250 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh index d96c6b87..d27da2c9 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh @@ -141,7 +141,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26778/^6.7/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26791/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26793/^6.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26805/^6.8/0001.patch -editKernelLocalversion "-dos.p142" +editKernelLocalversion "-dos.p141" else echo "kernel_xiaomi_vayu is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE"