From 359ce4608f871426246d37d97e8a3c27316aa9af Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 7 Dec 2021 20:22:56 -0500 Subject: [PATCH] Small updates Signed-off-by: Tad --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_amazon_hdx-common.sh | 4 +--- .../CVE_Patchers/android_kernel_asus_grouper.sh | 4 +--- .../LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh | 4 +--- .../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 | 4 +--- .../CVE_Patchers/android_kernel_samsung_manta.sh | 4 +--- .../CVE_Patchers/android_kernel_samsung_smdk4412.sh | 4 +--- .../CVE_Patchers/android_kernel_samsung_tuna.sh | 4 +--- .../CVE_Patchers/android_kernel_samsung_universal8890.sh | 4 +--- Scripts/LineageOS-14.1/Functions.sh | 1 + Scripts/LineageOS-14.1/Patch.sh | 2 +- .../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 | 4 +--- .../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 | 4 +--- .../LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh | 4 +--- .../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 | 4 +--- .../LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh | 4 +--- .../CVE_Patchers/android_kernel_asus_msm8953.sh | 4 +--- .../CVE_Patchers/android_kernel_cyanogen_msm8916.sh | 4 +--- .../CVE_Patchers/android_kernel_cyanogen_msm8974.sh | 4 +--- .../CVE_Patchers/android_kernel_google_yellowstone.sh | 4 +--- .../CVE_Patchers/android_kernel_lge_hammerhead.sh | 4 +--- .../CVE_Patchers/android_kernel_samsung_apq8084.sh | 4 +--- .../CVE_Patchers/android_kernel_xiaomi_msm8937.sh | 4 +--- .../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 | 4 +--- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 4 +--- .../CVE_Patchers/android_kernel_google_yellowstone.sh | 4 +--- .../LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh | 4 +--- .../CVE_Patchers/android_kernel_motorola_msm8916.sh | 4 +--- .../CVE_Patchers/android_kernel_motorola_msm8992.sh | 4 +--- .../CVE_Patchers/android_kernel_motorola_msm8996.sh | 4 +--- .../CVE_Patchers/android_kernel_oneplus_msm8994.sh | 4 +--- .../CVE_Patchers/android_kernel_yandex_sdm660.sh | 4 +--- .../LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh | 4 +--- .../CVE_Patchers/android_kernel_essential_msm8998.sh | 4 +--- .../CVE_Patchers/android_kernel_fairphone_msm8974.sh | 4 +--- .../CVE_Patchers/android_kernel_fairphone_sdm632.sh | 4 +--- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 4 +--- .../LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh | 4 +--- .../LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh | 4 +--- Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh | 4 +--- .../LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh | 4 +--- .../LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh | 4 +--- .../LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh | 4 +--- .../LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh | 4 +--- .../CVE_Patchers/android_kernel_motorola_msm8974.sh | 4 +--- .../CVE_Patchers/android_kernel_nextbit_msm8992.sh | 4 +--- .../CVE_Patchers/android_kernel_oneplus_msm8996.sh | 4 +--- .../CVE_Patchers/android_kernel_oneplus_sdm845.sh | 4 +--- .../CVE_Patchers/android_kernel_oppo_msm8974.sh | 4 +--- .../LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh | 4 +--- .../CVE_Patchers/android_kernel_samsung_msm8930-common.sh | 4 +--- .../CVE_Patchers/android_kernel_samsung_msm8974.sh | 4 +--- .../LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh | 4 +--- Scripts/LineageOS-18.1/Functions.sh | 3 ++- 69 files changed, 70 insertions(+), 198 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 70da6255..0e86fe4a 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 70da62550d836089128428cc0c83b42a32dc5f6e +Subproject commit 0e86fe4ab77c141bce18ff054c1c72cf81c7757b 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 ab8a22cd..b66c905f 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,8 +709,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch @@ -743,5 +741,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.p743" +editKernelLocalversion "-dos.p741" 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 601748e5..7df102a2 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,8 +380,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -407,5 +405,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.p407" +editKernelLocalversion "-dos.p405" 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 06574dff..75b94f3b 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,8 +394,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -444,5 +442,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.p444" +editKernelLocalversion "-dos.p442" 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 e53a2a30..003995c0 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,8 +467,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +495,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.p495" 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 ff23c370..687168e1 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,8 +548,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +576,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.p576" 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 d5b96622..caa2ea28 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,8 +588,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +614,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/^5.11/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.p614" 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 a7a7876d..51384658 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,8 +176,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -202,5 +200,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.p202" +editKernelLocalversion "-dos.p200" 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 ad501450..c44b25a7 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,8 +296,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -321,5 +319,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.p321" +editKernelLocalversion "-dos.p319" 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 ac85bca7..3b656617 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,8 +365,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -385,5 +383,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.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.p383" 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 29d24a74..bd710c30 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,8 +359,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -379,5 +377,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.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.p377" 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 bbdb0eb0..1bac76f8 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,8 +627,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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-3483/3.18/0008.patch @@ -672,5 +670,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.p672" +editKernelLocalversion "-dos.p670" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 37d308a1..d1a229a0 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -107,6 +107,7 @@ patchWorkspace() { repopick -it n-asb-2021-10; repopick -it tzdb2021c_N; repopick -it n-asb-2021-11; + repopick -it n-asb-2021-12; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 7a6974f2..893c3083 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -75,7 +75,7 @@ applyPatch "$DOS_PATCHES/android_build/0001-OTA_Keys.patch"; #Add correct keys t sed -i '50i$(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 '296iLOCAL_AAPT_FLAGS += --auto-add-overlay' core/package_internal.mk; sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk; #Replace the Messaging app with Silence -sed -i 's/2021-06-05/2021-11-05/' core/version_defaults.mk; #Bump Security String #n-asb-2021-11 #XXX +sed -i 's/2021-06-05/2021-12-05/' core/version_defaults.mk; #Bump Security String #n-asb-2021-12 #XXX fi; if enterAndClear "device/qcom/sepolicy"; then 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 44c93ee4..61adf17f 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,8 +567,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +592,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.p592" 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 b9cf0906..e91c9562 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,8 +347,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +385,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.p385" 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 a82c3286..0adbfd03 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,8 +588,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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-3483/3.18/0008.patch @@ -637,5 +635,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.p637" +editKernelLocalversion "-dos.p635" 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 3325c92d..b0ca9a11 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,8 +346,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -401,5 +399,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.p401" +editKernelLocalversion "-dos.p399" 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 e7f6b430..a0704e3c 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,8 +356,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +382,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.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.p382" 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 5c6f90ee..f9033025 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,8 +491,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +520,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.p520" 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 d6e2ff66..6d08e078 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,8 +479,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +507,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.p507" 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 a248ef4b..aeb3cf25 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,8 +493,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -523,5 +521,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.p523" +editKernelLocalversion "-dos.p521" 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 dcd1935d..41225386 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,8 +557,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch @@ -589,5 +587,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.p589" +editKernelLocalversion "-dos.p587" 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 6d999b80..5a907dc5 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,8 +478,6 @@ 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/ANY/0001.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 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 @@ -526,5 +524,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.p526" +editKernelLocalversion "-dos.p524" 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 95ff5838..3743838e 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,8 +258,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +287,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.p287" 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 933fe62c..6b51bde3 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,8 +383,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -411,5 +409,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/^5.11/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.p411" +editKernelLocalversion "-dos.p409" 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 d0abaf34..4261cd90 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,8 +352,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -380,5 +378,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/^5.11/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.p380" +editKernelLocalversion "-dos.p378" 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 c13b45a0..8d96b61a 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,8 +574,6 @@ 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/ANY/0001.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 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 @@ -620,5 +618,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.p620" +editKernelLocalversion "-dos.p618" 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 7443b56b..a78213e7 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,8 +566,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +591,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.p591" 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 c80d66af..be55175d 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,8 +323,6 @@ 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/ANY/0001.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 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 @@ -390,5 +388,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.p390" +editKernelLocalversion "-dos.p388" 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 aea5202b..d14a3460 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,8 +344,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +382,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.p382" 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 0124c835..7786fc22 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,8 +303,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -356,5 +354,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.p356" +editKernelLocalversion "-dos.p354" 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 d1abd209..c7b32e96 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,8 +408,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +434,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/^5.11/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.p434" 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 5dd543cc..65313d26 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,8 +557,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch @@ -589,5 +587,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.p589" +editKernelLocalversion "-dos.p587" 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 d91f6923..64342cfe 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,8 +214,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +243,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.p243" 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 b02fed91..23d81de4 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,8 +323,6 @@ 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/ANY/0001.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 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 @@ -390,5 +388,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.p390" +editKernelLocalversion "-dos.p388" cd "$DOS_BUILD_BASE" 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 7443b56b..a78213e7 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,8 +566,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +591,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.p591" 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 aea5202b..d14a3460 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,8 +344,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +382,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.p382" 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 38e907e0..a2bb5ea9 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,8 +391,6 @@ 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/ANY/0001.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 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 @@ -442,5 +440,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.p442" +editKernelLocalversion "-dos.p440" 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 e9f0bd98..7ca6a315 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,8 +248,6 @@ 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/0001.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 @@ -342,5 +340,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.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.p342" +editKernelLocalversion "-dos.p340" 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 d1abd209..c7b32e96 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,8 +408,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +434,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/^5.11/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.p434" 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 3c32e43f..f2d2236b 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,8 +407,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -458,5 +456,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.p458" +editKernelLocalversion "-dos.p456" 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 198b7f56..5b5e5a18 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,8 +399,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +435,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.p435" 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 ce1786cb..9e0fc19a 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,8 +331,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -359,5 +357,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/^5.11/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.p359" +editKernelLocalversion "-dos.p357" 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 da1687b8..3a1951e1 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,8 +488,6 @@ 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/ANY/0001.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 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 @@ -538,5 +536,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.p538" +editKernelLocalversion "-dos.p536" 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 2b56ee7d..4b55b95b 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,8 +332,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +358,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/^5.11/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.p358" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh index c7f39a46..78b1373b 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 @@ -219,8 +219,6 @@ 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/ANY/0001.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-1955/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch @@ -296,5 +294,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p296" +editKernelLocalversion "-dos.p294" 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 50ec204d..5bac1af0 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,8 +225,6 @@ 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/ANY/0001.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-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.4/0004.patch @@ -302,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.p302" +editKernelLocalversion "-dos.p300" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh index 88aab1dd..225c90e3 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh @@ -98,8 +98,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0001.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 -editKernelLocalversion "-dos.p101" +editKernelLocalversion "-dos.p99" cd "$DOS_BUILD_BASE" 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 8522c5fe..040e7bb5 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,8 +181,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +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/CVE-2021-Misc2/ANY/0043.patch -editKernelLocalversion "-dos.p206" +editKernelLocalversion "-dos.p204" 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 b74c83d9..c7a99b38 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,8 +207,6 @@ 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/0001.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 @@ -309,5 +307,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.p309" +editKernelLocalversion "-dos.p307" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh index 74a320c5..0249cd44 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,8 +111,6 @@ 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/0001.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 @@ -194,5 +192,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch -editKernelLocalversion "-dos.p194" +editKernelLocalversion "-dos.p192" 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 cb484e3f..aafd1eae 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,8 +338,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -369,5 +367,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.p369" +editKernelLocalversion "-dos.p367" cd "$DOS_BUILD_BASE" 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 661b72de..1b162a8b 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,8 +404,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -455,5 +453,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.p455" +editKernelLocalversion "-dos.p453" 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 b52bb329..c2779563 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,8 +332,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +379,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.p381" +editKernelLocalversion "-dos.p379" 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 194b3474..ccfd6a8a 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 @@ -359,8 +359,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -407,5 +405,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.p405" 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 cf188bac..43ff4100 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,8 +321,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -367,5 +365,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.p367" +editKernelLocalversion "-dos.p365" 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 abf23993..32858948 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,8 +465,6 @@ 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/ANY/0001.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 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 @@ -513,5 +511,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.p513" +editKernelLocalversion "-dos.p511" 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 a9b6ef52..2b821dab 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,8 +237,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +265,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.p265" 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 be68b958..10d13054 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,8 +393,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +436,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.p436" 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 d118ba49..c38739e7 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,8 +377,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -405,5 +403,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/^5.11/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.p405" +editKernelLocalversion "-dos.p403" 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 28fc1f80..1da5fc0d 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,8 +383,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch @@ -435,5 +433,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.p435" +editKernelLocalversion "-dos.p433" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh index 572f1c73..ead998c6 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh @@ -76,8 +76,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0929/ANY/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/4.9/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/4.9/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.9/0007.patch @@ -94,5 +92,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33098/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch -editKernelLocalversion "-dos.p94" +editKernelLocalversion "-dos.p92" cd "$DOS_BUILD_BASE" 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 42f785a0..49be82f9 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,8 +279,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +326,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.p326" 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 965e9ae8..c6361883 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,8 +354,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -407,5 +405,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.p407" +editKernelLocalversion "-dos.p405" 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 d97ce898..0a346a5e 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 @@ -434,8 +434,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 @@ -486,5 +484,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.p486" +editKernelLocalversion "-dos.p484" 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 df13a927..c2c4b953 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,8 +180,6 @@ 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/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.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 +212,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.p212" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh index 1973eba9..59860a06 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,8 +214,6 @@ 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/ANY/0001.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-3178/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.4/0046.patch @@ -290,5 +288,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.p290" +editKernelLocalversion "-dos.p288" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index eb03f87e..9ee4a1a5 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -130,8 +130,9 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; - #source build/envsetup.sh; + source build/envsetup.sh; #repopick -it eleven-firewall; + repopick -it R_asb_2021-12; #TODO: pick missing sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";