From ce6ee9d8e4f8c9a4f0deb6c1d406a53157c4eed9 Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 11 Jan 2022 05:02:52 -0500 Subject: [PATCH] Update CVE patchers CVE-2021-0961 should be fine now Signed-off-by: Tad --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_amazon_hdx-common.sh | 3 ++- .../CVE_Patchers/android_kernel_asus_grouper.sh | 3 ++- .../LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh | 3 ++- .../LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh | 4 +++- .../LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh | 4 +++- .../CVE_Patchers/android_kernel_motorola_msm8992.sh | 4 +++- .../CVE_Patchers/android_kernel_samsung_exynos5420.sh | 3 ++- .../CVE_Patchers/android_kernel_samsung_manta.sh | 3 ++- .../CVE_Patchers/android_kernel_samsung_smdk4412.sh | 3 ++- .../CVE_Patchers/android_kernel_samsung_tuna.sh | 3 ++- .../CVE_Patchers/android_kernel_samsung_universal8890.sh | 4 +++- .../LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh | 4 +++- .../CVE_Patchers/android_kernel_asus_msm8916.sh | 4 +++- .../CVE_Patchers/android_kernel_google_dragon.sh | 4 +++- .../LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh | 3 ++- .../CVE_Patchers/android_kernel_htc_flounder.sh | 4 +++- .../LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8994.sh | 4 +++- .../CVE_Patchers/android_kernel_huawei_angler.sh | 4 +++- .../CVE_Patchers/android_kernel_lge_bullhead.sh | 4 +++- .../CVE_Patchers/android_kernel_lge_hammerhead.sh | 3 ++- .../LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh | 3 ++- .../LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh | 4 +++- .../CVE_Patchers/android_kernel_nextbit_msm8992.sh | 4 +++- .../CVE_Patchers/android_kernel_oneplus_msm8994.sh | 4 +++- .../LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh | 3 ++- .../LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh | 4 +++- .../CVE_Patchers/android_kernel_asus_msm8953.sh | 3 ++- .../CVE_Patchers/android_kernel_cyanogen_msm8916.sh | 4 +++- .../CVE_Patchers/android_kernel_cyanogen_msm8974.sh | 3 ++- .../CVE_Patchers/android_kernel_google_yellowstone.sh | 4 +++- .../CVE_Patchers/android_kernel_lge_hammerhead.sh | 3 ++- .../CVE_Patchers/android_kernel_samsung_apq8084.sh | 4 +++- .../CVE_Patchers/android_kernel_xiaomi_msm8937.sh | 3 ++- Scripts/LineageOS-16.0/Patch.sh | 1 + .../LineageOS-17.1/CVE_Patchers/android_kernel_asus_fugu.sh | 4 +++- .../CVE_Patchers/android_kernel_cyanogen_msm8916.sh | 4 +++- .../CVE_Patchers/android_kernel_google_marlin.sh | 3 ++- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 3 ++- .../CVE_Patchers/android_kernel_google_yellowstone.sh | 4 +++- .../LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh | 3 ++- .../CVE_Patchers/android_kernel_motorola_msm8916.sh | 4 +++- .../CVE_Patchers/android_kernel_motorola_msm8992.sh | 4 +++- .../CVE_Patchers/android_kernel_motorola_msm8996.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_msm8994.sh | 4 +++- .../CVE_Patchers/android_kernel_oneplus_sm7250.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 2 +- .../CVE_Patchers/android_kernel_xiaomi_sm6150.sh | 2 +- .../CVE_Patchers/android_kernel_yandex_sdm660.sh | 3 ++- .../LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh | 3 ++- Scripts/LineageOS-17.1/Patch.sh | 1 + .../CVE_Patchers/android_kernel_fairphone_msm8974.sh | 3 ++- .../CVE_Patchers/android_kernel_fairphone_sdm632.sh | 3 ++- .../CVE_Patchers/android_kernel_google_coral.sh | 2 +- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 3 ++- .../LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh | 3 ++- .../CVE_Patchers/android_kernel_google_redbull.sh | 2 +- .../CVE_Patchers/android_kernel_google_sunfish.sh | 2 +- .../LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh | 3 ++- Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh | 3 ++- .../LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh | 3 ++- .../LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh | 3 ++- .../LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh | 3 ++- .../LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh | 4 +++- .../CVE_Patchers/android_kernel_motorola_msm8974.sh | 3 ++- .../CVE_Patchers/android_kernel_nextbit_msm8992.sh | 4 +++- .../CVE_Patchers/android_kernel_oneplus_msm8996.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 2 +- .../CVE_Patchers/android_kernel_oppo_msm8974.sh | 3 ++- .../LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh | 3 ++- .../CVE_Patchers/android_kernel_samsung_msm8930-common.sh | 3 ++- .../CVE_Patchers/android_kernel_samsung_msm8974.sh | 3 ++- .../LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm660.sh | 3 ++- .../LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm845.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm8150.sh | 2 +- .../CVE_Patchers/android_kernel_xiaomi_sm8250.sh | 2 +- .../LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh | 3 ++- 77 files changed, 168 insertions(+), 75 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index f1691894..998a4f71 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit f1691894b7e2eefd889f817110f5c4435bcf2187 +Subproject commit 998a4f713c83e30a93419d373fcfbe8b2d8670fe diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh index 8f541324..3c6f8f22 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh @@ -709,6 +709,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -744,5 +745,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9728/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch -editKernelLocalversion "-dos.p744" +editKernelLocalversion "-dos.p745" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh index 34a38583..10834389 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh @@ -380,6 +380,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -408,5 +409,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0061.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0062.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch -editKernelLocalversion "-dos.p408" +editKernelLocalversion "-dos.p409" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh index a3302a8d..ab03c5f4 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh @@ -394,6 +394,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -445,5 +446,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0046.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch -editKernelLocalversion "-dos.p445" +editKernelLocalversion "-dos.p446" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh index 9b1418f9..cf541e24 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh @@ -467,6 +467,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -497,5 +499,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6937/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p497" +editKernelLocalversion "-dos.p499" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh index 08206e37..aa0619f2 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh @@ -548,6 +548,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -578,5 +580,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.10/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p578" +editKernelLocalversion "-dos.p580" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh index 0b496d64..8a38ef6b 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh @@ -588,6 +588,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -616,5 +618,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p616" +editKernelLocalversion "-dos.p618" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_exynos5420.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_exynos5420.sh index 767ee487..995af313 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_exynos5420.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_exynos5420.sh @@ -176,6 +176,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -203,5 +204,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0071.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0072.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0073.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch -editKernelLocalversion "-dos.p203" +editKernelLocalversion "-dos.p204" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh index 5f335a67..1ff713b8 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh @@ -296,6 +296,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -322,5 +323,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0060.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0061.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0062.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch -editKernelLocalversion "-dos.p322" +editKernelLocalversion "-dos.p323" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh index 312a395e..c364d3c7 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh @@ -365,6 +365,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -385,5 +386,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0060.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch -editKernelLocalversion "-dos.p385" +editKernelLocalversion "-dos.p386" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh index 04c721fa..b41af99b 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh @@ -359,6 +359,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -379,5 +380,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0060.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch -editKernelLocalversion "-dos.p379" +editKernelLocalversion "-dos.p380" cd "$DOS_BUILD_BASE" 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 ccbb35d7..37dd172e 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 @@ -627,6 +627,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -677,5 +679,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.p677" +editKernelLocalversion "-dos.p679" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh index 01eb3f8f..7125428a 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh @@ -567,6 +567,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0399/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -594,5 +596,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use- git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p594" +editKernelLocalversion "-dos.p596" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh index fefd82d6..71ea1c55 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh @@ -347,6 +347,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36312/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -387,5 +389,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0041.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p387" +editKernelLocalversion "-dos.p389" 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 b486f45e..cba5aa8d 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 @@ -588,6 +588,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -642,5 +644,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.p642" +editKernelLocalversion "-dos.p644" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh index c7423e84..ce4f8ef6 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh @@ -346,6 +346,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -402,5 +403,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch -editKernelLocalversion "-dos.p402" +editKernelLocalversion "-dos.p403" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh index c537c7a1..fb943d19 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh @@ -356,6 +356,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0399/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -384,5 +386,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p384" +editKernelLocalversion "-dos.p386" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8994.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8994.sh index 3faa8a0c..67cdfa9a 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8994.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8994.sh @@ -491,6 +491,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -522,5 +524,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6937/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p522" +editKernelLocalversion "-dos.p524" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh index cbd57ad1..8c936cbf 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh @@ -479,6 +479,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0399/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -509,5 +511,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6937/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p509" +editKernelLocalversion "-dos.p511" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh index 45c8780f..478cdee8 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh @@ -493,6 +493,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0399/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -524,5 +526,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6937/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p524" +editKernelLocalversion "-dos.p526" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh index b3be488f..60976dc7 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh @@ -557,6 +557,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -590,5 +591,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch -editKernelLocalversion "-dos.p590" +editKernelLocalversion "-dos.p591" 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 2a984703..9b96535a 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 @@ -478,6 +478,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch @@ -530,5 +531,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.p530" +editKernelLocalversion "-dos.p531" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh index 478c5d3f..3e47deb6 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh @@ -258,6 +258,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0399/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -289,5 +291,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p289" +editKernelLocalversion "-dos.p291" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh index 251e1d71..3c45c957 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh @@ -383,6 +383,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36312/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -412,5 +414,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p412" +editKernelLocalversion "-dos.p414" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh index 8dc67e37..f91c5ba1 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh @@ -352,6 +352,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36312/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -381,5 +383,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p381" +editKernelLocalversion "-dos.p383" 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 f1f7efd5..d0fd7df9 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 @@ -574,6 +574,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch @@ -625,5 +626,5 @@ 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.p625" +editKernelLocalversion "-dos.p626" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh index 7396d0c3..b54e45ca 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh @@ -566,6 +566,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0399/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -593,5 +595,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use- git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p593" +editKernelLocalversion "-dos.p595" 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 86471d1e..a6d51b7b 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 @@ -323,6 +323,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch @@ -395,5 +396,5 @@ 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.p395" +editKernelLocalversion "-dos.p396" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh index d75a4d1e..b9bdf9d9 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh @@ -344,6 +344,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36312/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -384,5 +386,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0041.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p384" +editKernelLocalversion "-dos.p386" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8974.sh index 948a24cc..a06a1385 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8974.sh @@ -303,6 +303,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -357,5 +358,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0032.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0040.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0041.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch -editKernelLocalversion "-dos.p357" +editKernelLocalversion "-dos.p358" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_yellowstone.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_yellowstone.sh index b262fe57..0b737f2c 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_yellowstone.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_yellowstone.sh @@ -408,6 +408,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -436,5 +438,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p436" +editKernelLocalversion "-dos.p438" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh index df9db815..3fba71a5 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh @@ -557,6 +557,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -590,5 +591,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch -editKernelLocalversion "-dos.p590" +editKernelLocalversion "-dos.p591" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_apq8084.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_apq8084.sh index c3722004..3cd769c4 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_apq8084.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_apq8084.sh @@ -214,6 +214,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0399/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -245,5 +247,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p245" +editKernelLocalversion "-dos.p247" 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 7e2dc806..71b79950 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 @@ -323,6 +323,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch @@ -395,5 +396,5 @@ 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.p395" +editKernelLocalversion "-dos.p396" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 829e6634..a18015a0 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -76,6 +76,7 @@ applyPatch "$DOS_PATCHES/android_build/0002-Enable_fwrapv.patch"; #Use -fwrapv a sed -i '74i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches. sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk target/product/treble_common.mk; #Replace the Messaging app with Silence sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 17/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS) +sed -i 's/2021-12-05/2022-01-05/' core/version_defaults.mk; #Bump Security String #P_asb_2022-01 #XXX fi; if enterAndClear "build/soong"; then diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_asus_fugu.sh index 7396d0c3..b54e45ca 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_asus_fugu.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_asus_fugu.sh @@ -566,6 +566,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0399/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -593,5 +595,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use- git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p593" +editKernelLocalversion "-dos.p595" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh index d75a4d1e..b9bdf9d9 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh @@ -344,6 +344,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36312/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -384,5 +386,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0041.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p384" +editKernelLocalversion "-dos.p386" 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 ac2d329c..e59acc57 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 @@ -391,6 +391,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch @@ -447,5 +448,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.p447" +editKernelLocalversion "-dos.p448" 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 1716b79d..f19f4c0a 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 @@ -248,6 +248,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0941/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1939/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch @@ -349,5 +350,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.9/0005.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.p349" +editKernelLocalversion "-dos.p350" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_yellowstone.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_yellowstone.sh index b262fe57..0b737f2c 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_yellowstone.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_yellowstone.sh @@ -408,6 +408,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -436,5 +438,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p436" +editKernelLocalversion "-dos.p438" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh index d04bec2b..1331bac4 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -407,6 +407,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -459,5 +460,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0032.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0040.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0041.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch -editKernelLocalversion "-dos.p459" +editKernelLocalversion "-dos.p460" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8916.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8916.sh index d9432f41..f18ef32a 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8916.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8916.sh @@ -399,6 +399,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -437,5 +439,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p437" +editKernelLocalversion "-dos.p439" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh index 72930ccc..9dcbf69b 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh @@ -331,6 +331,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36312/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -360,5 +362,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p360" +editKernelLocalversion "-dos.p362" 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 4439df5e..78dbd63c 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 @@ -488,6 +488,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch @@ -543,5 +544,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15815/qcacld-2.0/0002.patch --directo 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.p543" +editKernelLocalversion "-dos.p544" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh index 2655a757..2172968f 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh @@ -332,6 +332,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36312/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -361,5 +363,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p361" +editKernelLocalversion "-dos.p363" 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 91b6d940..b6468629 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 @@ -286,7 +286,7 @@ 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-0937/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0938/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch 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 3925a0af..b0893644 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 @@ -357,7 +357,7 @@ 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-0937/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0941/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch 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 f0999678..b0f389a2 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 @@ -91,7 +91,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1927/ANY/0001.patch 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 03568662..b48d15c5 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 @@ -218,6 +218,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch 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-0937/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1955/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch @@ -303,5 +304,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.4/0004.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.p303" +editKernelLocalversion "-dos.p304" 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 88929c5f..fca5bd72 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 @@ -225,6 +225,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch 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-0937/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.4/0004.patch @@ -311,5 +312,5 @@ 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.p311" +editKernelLocalversion "-dos.p312" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 1102bc30..1e4471c3 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -73,6 +73,7 @@ sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aap sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk target/product/gsi_common.mk; #Replace the Messaging app with Silence awk -i inplace '!/updatable_apex.mk/' target/product/mainline_system.mk; #Disable APEX sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS) +sed -i 's/2021-12-05/2022-01-05/' core/version_defaults.mk; #Bump Security String #Q_asb_2022-01 #XXX fi; if enterAndClear "build/soong"; then diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh index 38240469..847a3fee 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh @@ -181,6 +181,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -206,5 +207,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0071.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0072.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0073.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch -editKernelLocalversion "-dos.p206" +editKernelLocalversion "-dos.p207" 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 6a0bae7b..31a33466 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 @@ -207,6 +207,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0941/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1939/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1962/ANY/0001.patch @@ -316,5 +317,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.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.p316" +editKernelLocalversion "-dos.p317" 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 b15b2e44..94b8e2d3 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 @@ -101,7 +101,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch 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 a087f02f..b4871e2c 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 @@ -111,6 +111,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0941/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0036.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0037.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0038.patch @@ -201,5 +202,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^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-2020-24586/4.9/0009.patch -editKernelLocalversion "-dos.p201" +editKernelLocalversion "-dos.p202" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh index 8602971f..078f91b7 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh @@ -338,6 +338,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -370,5 +371,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch -editKernelLocalversion "-dos.p370" +editKernelLocalversion "-dos.p371" 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 567ab074..84bea3b1 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 @@ -96,7 +96,7 @@ 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-0937/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0938/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.19/0003.patch 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 72189104..2d732e57 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 @@ -98,7 +98,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-BleedingToothExtras/^5.10/0001.patch 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-0937/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh index f9213274..757f70eb 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -404,6 +404,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -456,5 +457,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0032.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0040.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0041.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch -editKernelLocalversion "-dos.p456" +editKernelLocalversion "-dos.p457" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh index e9237ddd..21532ffb 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh @@ -332,6 +332,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -382,5 +383,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0032.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0040.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0041.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch -editKernelLocalversion "-dos.p382" +editKernelLocalversion "-dos.p383" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh index b6fcff7e..ca6e7c25 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh @@ -358,6 +358,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -407,5 +408,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0045.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0046.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch -editKernelLocalversion "-dos.p407" +editKernelLocalversion "-dos.p408" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh index 07964cb6..a028b3fe 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh @@ -321,6 +321,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -368,5 +369,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0032.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0040.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0041.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch -editKernelLocalversion "-dos.p368" +editKernelLocalversion "-dos.p369" 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 7771c918..c9a93a5e 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 @@ -465,6 +465,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch @@ -517,5 +518,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.p517" +editKernelLocalversion "-dos.p518" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh index fba7f93e..20a05a3b 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh @@ -237,6 +237,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36312/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0399/3.18/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -267,5 +269,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p267" +editKernelLocalversion "-dos.p269" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8974.sh index 1a3e95c2..68315310 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -393,6 +393,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -438,5 +439,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0040.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0041.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch -editKernelLocalversion "-dos.p438" +editKernelLocalversion "-dos.p439" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh index 4a0f612e..ecf8bf25 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh @@ -377,6 +377,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36312/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -406,5 +408,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p406" +editKernelLocalversion "-dos.p408" 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 0efbfbd8..7a054ee9 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 @@ -383,6 +383,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1955/qcacld-2.0/0003.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch @@ -440,5 +441,5 @@ 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.p440" +editKernelLocalversion "-dos.p441" 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 ed941c80..9986825c 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 @@ -151,7 +151,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oppo_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oppo_msm8974.sh index 536eda70..6e20a0cd 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oppo_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oppo_msm8974.sh @@ -279,6 +279,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -328,5 +329,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0040.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0041.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch -editKernelLocalversion "-dos.p328" +editKernelLocalversion "-dos.p329" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh index 5ba2038a..e96ccd00 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh @@ -354,6 +354,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -408,5 +409,5 @@ git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0004/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch -editKernelLocalversion "-dos.p408" +editKernelLocalversion "-dos.p409" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8930-common.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8930-common.sh index 4c0cba0d..92327b8b 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8930-common.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8930-common.sh @@ -432,6 +432,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -485,5 +486,5 @@ git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0004/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch -editKernelLocalversion "-dos.p485" +editKernelLocalversion "-dos.p486" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8974.sh index 7c84321c..687aafbb 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8974.sh @@ -180,6 +180,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -214,5 +215,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0068.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0071.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0072.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0073.patch -editKernelLocalversion "-dos.p214" +editKernelLocalversion "-dos.p215" 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 c62e4c6f..5e868117 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 @@ -207,6 +207,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch 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-0937/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1955/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.4/0004.patch @@ -291,5 +292,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.4/0004.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.p291" +editKernelLocalversion "-dos.p292" 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 d6bea27e..6670587c 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 @@ -264,6 +264,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0941/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1939/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1941/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn @@ -365,5 +366,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.9/0005.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.p366" 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 84af3593..14b8261e 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 @@ -179,7 +179,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch 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 c27325b0..61ec11af 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 @@ -210,7 +210,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0938/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch 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 30a9116b..aeaf3beb 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 @@ -214,6 +214,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch 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-0937/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.4/0046.patch @@ -299,5 +300,5 @@ 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.p299" +editKernelLocalversion "-dos.p300" cd "$DOS_BUILD_BASE"