From 2d7a1ea25cad87af94246e66397219c8d8d482d1 Mon Sep 17 00:00:00 2001 From: Tavi Date: Tue, 7 May 2024 08:22:30 -0400 Subject: [PATCH] Update CVE patchers Signed-off-by: Tavi --- Logs/resetWorkspace-LineageOS-14.1.txt | 2 +- Logs/resetWorkspace-LineageOS-20.0.txt | 2 +- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_xiaomi_sm6150.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm8150.sh | 3 ++- .../android_kernel_google_gs101_private_gs-google.sh | 3 ++- .../android_kernel_google_gs201_private_gs-google.sh | 3 ++- .../CVE_Patchers/android_kernel_google_redbull.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm6150.sh | 3 ++- .../LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh | 3 ++- 11 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Logs/resetWorkspace-LineageOS-14.1.txt b/Logs/resetWorkspace-LineageOS-14.1.txt index 7a26656c..9c884fdd 100644 --- a/Logs/resetWorkspace-LineageOS-14.1.txt +++ b/Logs/resetWorkspace-LineageOS-14.1.txt @@ -132,7 +132,7 @@ external/eyes-free 16bd4c7a4d1bfe229068b637614dad7c48dd2ceb external/f2fs-tools d895e392df9d44c7e5ccabd90e5fa61eaa17da57 external/fdlibm eb6c9fcfe52e665917ff5a9670c909f9e3c92fa5 external/fec 791afbe58ff9f55145c4adf632ab8cc9ca6e5686 -external/ffmpeg d78de94d18756b74b97509e581097014efbbbca8 +external/ffmpeg 61190001372364379b095b4cd1de6787213def0e external/fio 1aec78b2e6aaf90d45b8e3f9b3d2f07dd9334827 external/flac 3c73deb884acf79764a769cac47a12d214929fa5 external/fonttools fede58680958e96e6e8f61c3cc6282f798452c53 diff --git a/Logs/resetWorkspace-LineageOS-20.0.txt b/Logs/resetWorkspace-LineageOS-20.0.txt index 9fa1e54a..0c2381ea 100644 --- a/Logs/resetWorkspace-LineageOS-20.0.txt +++ b/Logs/resetWorkspace-LineageOS-20.0.txt @@ -182,7 +182,7 @@ external/arm-trusted-firmware d2ebd507612c6d0e62ab68cc89a76b29d47a4394 external/armnn 99622dfb30039a7c13b772690605a59520eb3819 external/auto 3e44de8d3d2c748ddc742f3ee342ff7cc8344c50 external/autotest 025ef692cb20347c580951331369335b01ee44fb -external/avb f82d0b0162bee79b08bb93bb79e5b13e4a2f4e86 +external/avb ba9d77598670f4e221490aa0e7aa9b27564cf2fb external/bazel-skylib e3e4f5325f3a9b46381531439b27dcfb294477fe external/bazelbuild-rules_android 7f7740c9ea674bf465c2afe0496065f7a6a0449e external/bc f2b0d658000e59ee81f263ea73b1c3870a1e8993 diff --git a/Patches/Linux b/Patches/Linux index 02a693fb..27fc9564 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 02a693fb0f8a4831c487b530ad37e0449c897f1a +Subproject commit 27fc956495289496d2d76a681ffbc0e09133ebd1 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 5db3963a..dfafbd58 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 @@ -554,6 +554,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/^6.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0639/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21468/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-22099/^6.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-23849/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-24855/^6.4/0001.patch @@ -606,7 +607,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27074/^6.8/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27075/^6.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27388/^6.8/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p606" +editKernelLocalversion "-dos.p607" 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 4976398a..e74aeb91 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 @@ -643,6 +643,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/^6.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0639/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21468/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-22099/^6.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-23849/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-24855/^6.4/0001.patch @@ -698,7 +699,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.p698" +editKernelLocalversion "-dos.p699" 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_google_gs101_private_gs-google.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh index c3e44692..fdb53078 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 @@ -292,6 +292,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0646/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0841/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-1151/5.10/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-22099/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-23196/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-23849/5.10/0003.patch @@ -465,7 +466,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27437/5.10/0004.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26812/5.10/0004.patch -editKernelLocalversion "-dos.p465" +editKernelLocalversion "-dos.p466" 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 34d904dc..0dbdf76f 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 @@ -290,6 +290,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0646/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0841/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-1151/5.10/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-22099/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-23196/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-23849/5.10/0003.patch @@ -463,7 +464,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27437/5.10/0004.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26812/5.10/0004.patch -editKernelLocalversion "-dos.p463" +editKernelLocalversion "-dos.p464" 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_redbull.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh index f2d3a680..fc28b6a4 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 @@ -272,6 +272,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0607/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0639/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21468/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-22099/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-23849/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-24855/^6.4/0001.patch @@ -373,7 +374,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27077/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27078/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27388/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52601/4.19/0002.patch -editKernelLocalversion "-dos.p373" +editKernelLocalversion "-dos.p374" 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_sm8150.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh index e30b23f4..164b51f8 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 @@ -610,6 +610,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/^6.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0639/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21468/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-22099/^6.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-23849/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-24855/^6.4/0001.patch @@ -664,7 +665,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27388/^6.8/0002.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.p664" +editKernelLocalversion "-dos.p665" 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_xiaomi_sm6150.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm6150.sh index c7018524..9abc6958 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 @@ -115,6 +115,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52606/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52619/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52650/^6.7/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/^6.4/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-22099/^6.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-23849/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-24855/^6.4/0001.patch @@ -172,7 +173,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27059/^6.8/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27074/^6.8/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27075/^6.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27388/^6.8/0002.patch -editKernelLocalversion "-dos.p172" +editKernelLocalversion "-dos.p173" 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_vayu.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh index 4e15cf08..44746a20 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 @@ -120,6 +120,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52619/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52650/^6.7/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/^6.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21468/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-22099/^6.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-23849/^6.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-24855/^6.4/0001.patch @@ -177,7 +178,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27059/^6.8/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27074/^6.8/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27075/^6.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27388/^6.8/0002.patch -editKernelLocalversion "-dos.p177" +editKernelLocalversion "-dos.p178" else echo "kernel_xiaomi_vayu is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE"