From 5245109cc109e8a3312a689eeb23165337d7342c Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 19 Feb 2022 22:28:35 -0500 Subject: [PATCH] Update CVE patchers Signed-off-by: Tad --- Patches/Linux | 2 +- .../android_kernel_samsung_universal8890.sh | 4 +++- .../CVE_Patchers/android_kernel_google_dragon.sh | 4 +++- .../CVE_Patchers/android_kernel_lge_msm8996.sh | 4 +++- .../CVE_Patchers/android_kernel_zte_msm8996.sh | 4 +++- .../CVE_Patchers/android_kernel_asus_msm8953.sh | 5 ++++- .../CVE_Patchers/android_kernel_xiaomi_msm8937.sh | 5 ++++- .../CVE_Patchers/android_kernel_google_marlin.sh | 4 +++- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 7 ++++++- .../CVE_Patchers/android_kernel_motorola_msm8996.sh | 5 ++++- .../CVE_Patchers/android_kernel_oneplus_sm7250.sh | 10 ++++++++-- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 10 ++++++++-- .../CVE_Patchers/android_kernel_xiaomi_sm6150.sh | 9 +++++++-- .../CVE_Patchers/android_kernel_yandex_sdm660.sh | 5 ++++- .../CVE_Patchers/android_kernel_zuk_msm8996.sh | 5 ++++- Scripts/LineageOS-17.1/Functions.sh | 3 +-- .../CVE_Patchers/android_kernel_essential_msm8998.sh | 4 +--- .../CVE_Patchers/android_kernel_fairphone_sdm632.sh | 7 ++++++- .../CVE_Patchers/android_kernel_fxtec_msm8998.sh | 6 ++---- .../CVE_Patchers/android_kernel_google_coral.sh | 9 +++++++-- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 7 ++++++- .../CVE_Patchers/android_kernel_google_redbull.sh | 9 +++++++-- .../CVE_Patchers/android_kernel_google_sunfish.sh | 9 +++++++-- .../CVE_Patchers/android_kernel_google_wahoo.sh | 5 ++++- .../CVE_Patchers/android_kernel_lge_msm8996.sh | 4 +++- .../CVE_Patchers/android_kernel_oneplus_msm8996.sh | 5 ++++- .../CVE_Patchers/android_kernel_oneplus_msm8998.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sdm845.sh | 7 ++++++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 9 +++++++-- .../CVE_Patchers/android_kernel_razer_msm8998.sh | 5 ++++- .../CVE_Patchers/android_kernel_razer_sdm845.sh | 6 +++++- .../CVE_Patchers/android_kernel_sony_sdm660.sh | 5 ++++- .../CVE_Patchers/android_kernel_sony_sdm845.sh | 7 ++++++- .../CVE_Patchers/android_kernel_xiaomi_sdm660.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sdm845.sh | 4 +++- .../CVE_Patchers/android_kernel_xiaomi_sm8150.sh | 9 +++++++-- .../CVE_Patchers/android_kernel_xiaomi_sm8250.sh | 9 +++++++-- .../CVE_Patchers/android_kernel_zuk_msm8996.sh | 5 ++++- Scripts/LineageOS-18.1/Functions.sh | 3 +-- 39 files changed, 171 insertions(+), 55 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 209deb62..00557a3b 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 209deb621f0559eaaf1890394a11868797c3afc4 +Subproject commit 00557a3bd8bdffc946502de06aa47cf23cdd4da6 diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh index edbd78d4..642c8fb2 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh @@ -672,6 +672,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0004-net-add-recursion-limit-to-GRO.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0005-tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch @@ -679,5 +681,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p679" +editKernelLocalversion "-dos.p681" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh index 71714a80..3e4fe6c3 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh @@ -634,6 +634,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0004/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0003-tunnels-Don-t-apply-GRO-to-multiple-layers-of-encaps.patch @@ -645,5 +647,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p645" +editKernelLocalversion "-dos.p647" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh index d40fed0d..5ac3b458 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -528,10 +528,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p533" +editKernelLocalversion "-dos.p535" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh index 989bc9f9..03a6de38 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh @@ -621,11 +621,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p627" +editKernelLocalversion "-dos.p629" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh index 83d2f129..c7a2380b 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh @@ -374,6 +374,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0002.patch @@ -392,11 +393,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p398" +editKernelLocalversion "-dos.p401" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh index 6a1694fd..1b1e6b31 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh @@ -374,6 +374,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0002.patch @@ -392,11 +393,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p398" +editKernelLocalversion "-dos.p401" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh index 8b885d0b..950a25eb 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -441,6 +441,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0005-tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch @@ -449,5 +451,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p449" +editKernelLocalversion "-dos.p451" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh index adfe2c9c..724f83cb 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh @@ -356,14 +356,19 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.9/0005.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.9/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.9/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0644/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p365" +editKernelLocalversion "-dos.p370" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh index fab1d7dd..4724d5a4 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh @@ -538,12 +538,15 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15815/qcacld-2.0/0002.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p545" +editKernelLocalversion "-dos.p548" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh index 527b4076..62a82759 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh @@ -327,6 +327,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3744/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3752/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3894/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4135/4.19/0002.patch @@ -412,16 +413,21 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43975/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.19/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.19/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc/^5.13/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0322/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.19/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.19/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0644/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24959/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.19/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.19/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.19/0005.patch @@ -429,5 +435,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.19/0011.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch -editKernelLocalversion "-dos.p429" +editKernelLocalversion "-dos.p435" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh index 4f6f15f6..f06cff5c 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh @@ -392,6 +392,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3752/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3894/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/^5.14/0001.patch @@ -457,16 +458,21 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.14/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0322/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.14/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0644/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24959/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.14/0005.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch -editKernelLocalversion "-dos.p468" +editKernelLocalversion "-dos.p474" cd "$DOS_BUILD_BASE" 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 053eaede..20d18864 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 @@ -139,6 +139,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3744/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3752/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3894/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/^5.14/0001.patch @@ -215,10 +216,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0322/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.14/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0644/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24959/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p220" +editKernelLocalversion "-dos.p225" cd "$DOS_BUILD_BASE" 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 9495c55a..7c343139 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 @@ -304,11 +304,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p310" +editKernelLocalversion "-dos.p313" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh index 410365bc..37ba7f60 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh @@ -311,12 +311,15 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p318" +editKernelLocalversion "-dos.p321" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 498298bf..f8868749 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -97,10 +97,9 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; - source build/envsetup.sh; + #source build/envsetup.sh; #repopick -it ten-firewall; #repopick -i 318916; #Fix kernel build with glibc 2.34 - repopick -it Q_asb_2022-02; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh index 69fa134f..9858e6c9 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh @@ -1,7 +1,5 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/essential/msm8998" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0300-0301.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0301-0302.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0004.patch @@ -102,5 +100,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch -editKernelLocalversion "-dos.p102" +editKernelLocalversion "-dos.p100" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh index 93050320..66f94b55 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh @@ -315,6 +315,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.9/0005.patch @@ -327,10 +328,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.9/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.9/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0644/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p332" +editKernelLocalversion "-dos.p337" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh index aa3d80e1..bfa7b369 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh @@ -1,7 +1,5 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/fxtec/msm8998" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0298-0299.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0300-0301.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0011.patch @@ -48,7 +46,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/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-43976/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch -editKernelLocalversion "-dos.p50" +editKernelLocalversion "-dos.p48" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh index 0477b959..39ebf691 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh @@ -137,6 +137,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3744/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3752/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3894/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/^5.14/0001.patch @@ -212,10 +213,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0322/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.14/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0644/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24959/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p217" +editKernelLocalversion "-dos.p222" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh index 961b63a7..7673cf34 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh @@ -209,13 +209,18 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.9/0005.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.9/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.9/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0644/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch -editKernelLocalversion "-dos.p217" +editKernelLocalversion "-dos.p222" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh index de56c181..1aad9a72 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh @@ -130,6 +130,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3744/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3752/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3894/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4135/4.19/0002.patch @@ -233,11 +234,15 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc/^5.13/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0322/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.19/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.19/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0644/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24959/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.19/0005.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch -editKernelLocalversion "-dos.p239" +editKernelLocalversion "-dos.p244" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh index de65ea82..012be7ad 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh @@ -134,6 +134,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3744/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3752/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3894/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/^5.14/0001.patch @@ -209,10 +210,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0322/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.14/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0644/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24959/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p214" +editKernelLocalversion "-dos.p219" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh index 171cf77d..821baf13 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh @@ -71,6 +71,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch -editKernelLocalversion "-dos.p72" +editKernelLocalversion "-dos.p75" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh index 71a2fdeb..2119cc5c 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -515,10 +515,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p520" +editKernelLocalversion "-dos.p522" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index 448bbeae..20a34867 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -436,12 +436,15 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p443" +editKernelLocalversion "-dos.p446" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh index 52fde0c5..4ca28251 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh @@ -50,6 +50,7 @@ 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-1941/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1945/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch -editKernelLocalversion "-dos.p51" +editKernelLocalversion "-dos.p52" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh index 801bfd12..713caf1e 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh @@ -103,10 +103,15 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.9/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.9/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0644/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch -editKernelLocalversion "-dos.p108" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch +editKernelLocalversion "-dos.p113" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh index 99221b04..616d21e1 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh @@ -193,6 +193,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3744/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3752/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3894/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/^5.14/0001.patch @@ -271,13 +272,17 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.14/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0322/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.14/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0644/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24959/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/^5.17/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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch -editKernelLocalversion "-dos.p279" +editKernelLocalversion "-dos.p284" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh index 30258f65..3c730acb 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh @@ -49,6 +49,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/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-43976/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch -editKernelLocalversion "-dos.p50" +editKernelLocalversion "-dos.p53" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh index 35c3e6e3..0552cf7d 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh @@ -73,10 +73,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33098/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38199/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.9/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch -editKernelLocalversion "-dos.p78" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch +editKernelLocalversion "-dos.p82" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm660.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm660.sh index 0ab9c62a..8b7db827 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm660.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm660.sh @@ -292,11 +292,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p298" +editKernelLocalversion "-dos.p301" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm845.sh index 42d7e9a9..5132ff13 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm845.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm845.sh @@ -273,14 +273,19 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.9/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.9/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0644/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p282" +editKernelLocalversion "-dos.p287" cd "$DOS_BUILD_BASE" 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 d1016454..287abcdb 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 @@ -45,6 +45,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/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-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch -editKernelLocalversion "-dos.p46" +editKernelLocalversion "-dos.p47" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index c32961d3..acf8ed61 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -65,7 +65,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33098/^5.12/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch -editKernelLocalversion "-dos.p67" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch +editKernelLocalversion "-dos.p69" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh index 5b193e1a..ce81dec4 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh @@ -229,6 +229,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3744/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3752/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3894/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/^5.14/0001.patch @@ -307,13 +308,17 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0322/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.14/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0644/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24959/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/^5.17/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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch -editKernelLocalversion "-dos.p315" +editKernelLocalversion "-dos.p320" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh index ba85ba65..e6c2930c 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh @@ -255,6 +255,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3744/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3752/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3894/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4135/4.19/0002.patch @@ -352,15 +353,19 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc/^5.13/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0322/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.19/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.19/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0644/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24959/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.19/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.19/0011.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch -editKernelLocalversion "-dos.p362" +editKernelLocalversion "-dos.p367" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh index 346e72a2..35406c7a 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh @@ -299,12 +299,15 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p306" +editKernelLocalversion "-dos.p309" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index 5a5d860f..bbb74b38 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -139,13 +139,12 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; - source build/envsetup.sh; + #source build/envsetup.sh; #repopick -it eleven-firewall; #repopick -i 314130; #adbconnection: don't spin if adbd isn't running #repopick -i 314453; #TaskViewTouchController: Null check current animation on drag #repopick -i 320663; #Trebuchet: Don't hide home screen rotation setting #repopick -i 321297; #fs_mgr: Don't enable clean_scratch_files on non-dynamic devices - repopick -it R_asb_2022-02; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";