From 3708cee48ad78347cce9ee2c8f61012c45800498 Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 24 Jul 2023 14:10:33 -0400 Subject: [PATCH] Churn Signed-off-by: Tad --- .../CVE_Patchers/android_kernel_oneplus_msm8998.sh | 14 +++----------- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 5 ++--- 2 files changed, 5 insertions(+), 14 deletions(-) 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 2273fcfe..c3b5804d 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 @@ -30,7 +30,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9211/4.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13693/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14875/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17052/4.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18174/^4.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18204/4.4/0004.patch @@ -39,7 +38,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16597/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^5.0/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10494/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12378/^5.1.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12456/^5.1.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14763/^5.1/0001.patch @@ -47,7 +45,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3625/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0935/4.9/0006.patch @@ -55,9 +52,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4034/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33656/4.4/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35084/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35119/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39792/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0435/4.4/0008.patch @@ -111,7 +105,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25654/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25677/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch @@ -140,6 +134,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42896-extra/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47929/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0045/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0047/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0394/4.4/0007.patch @@ -164,20 +159,17 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3090/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3141/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3159/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3161/4.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-21656/4.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-21657/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23454/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23455/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23559/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-26545/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28328/4.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28541/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-30772/4.4/0008.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-32269/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-34256/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35824/4.4/0001.patch -editKernelLocalversion "-dos.p177" +editKernelLocalversion "-dos.p169" else echo "kernel_oneplus_msm8998 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 19cb1fd0..d2e14b04 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 @@ -162,6 +162,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28941/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29372/^5.7/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0007.patch @@ -374,8 +375,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20369/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20566/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22075/ANY/0003.patch @@ -471,7 +470,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35824/4.14/0003.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.p471" +editKernelLocalversion "-dos.p470" else echo "kernel_oneplus_sm8150 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE"