From 260140f0a117a9a7ce4ffb79fd74da312988dcc0 Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 9 Oct 2020 12:06:02 -0400 Subject: [PATCH] Update CVE patchers --- Patches/Linux | 2 +- Scripts/Common/Fix_CVE_Patchers.sh | 4 ++-- .../CVE_Patchers/android_kernel_zte_msm8930.sh | 2 +- .../CVE_Patchers/android_kernel_amazon_hdx-common.sh | 2 +- .../CVE_Patchers/android_kernel_asus_grouper.sh | 5 ++--- .../CVE_Patchers/android_kernel_cyanogen_msm8974.sh | 3 ++- .../CVE_Patchers/android_kernel_fairphone_msm8974.sh | 2 +- .../CVE_Patchers/android_kernel_google_dragon.sh | 2 +- .../CVE_Patchers/android_kernel_google_marlin.sh | 2 +- .../CVE_Patchers/android_kernel_google_msm.sh | 2 +- .../CVE_Patchers/android_kernel_htc_msm8974.sh | 5 ++--- .../LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh | 5 ++--- .../CVE_Patchers/android_kernel_lge_hammerhead.sh | 2 +- .../LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh | 3 ++- .../CVE_Patchers/android_kernel_lge_msm8974.sh | 5 ++--- .../CVE_Patchers/android_kernel_lge_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_motorola_msm8974.sh | 4 ++-- .../CVE_Patchers/android_kernel_motorola_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_msm8974.sh | 5 ++--- .../CVE_Patchers/android_kernel_oneplus_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_samsung_exynos5420.sh | 3 +-- .../CVE_Patchers/android_kernel_samsung_jf.sh | 3 +-- .../CVE_Patchers/android_kernel_samsung_manta.sh | 5 ++--- .../CVE_Patchers/android_kernel_samsung_msm8974.sh | 3 +-- .../CVE_Patchers/android_kernel_samsung_universal8890.sh | 2 +- .../CVE_Patchers/android_kernel_zte_msm8996.sh | 2 +- Scripts/LineageOS-14.1/Functions.sh | 2 +- .../CVE_Patchers/android_kernel_cyanogen_msm8974.sh | 3 +-- .../CVE_Patchers/android_kernel_fairphone_msm8974.sh | 2 +- .../CVE_Patchers/android_kernel_google_marlin.sh | 2 +- .../CVE_Patchers/android_kernel_google_msm.sh | 2 +- .../CVE_Patchers/android_kernel_google_wahoo.sh | 2 +- .../CVE_Patchers/android_kernel_htc_msm8974.sh | 5 ++--- .../LineageOS-15.1/CVE_Patchers/android_kernel_lge_g3.sh | 5 ++--- .../CVE_Patchers/android_kernel_lge_hammerhead.sh | 2 +- .../LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh | 2 +- .../CVE_Patchers/android_kernel_lge_msm8974.sh | 3 +-- .../CVE_Patchers/android_kernel_lge_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_motorola_msm8974.sh | 7 +++---- .../CVE_Patchers/android_kernel_motorola_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_msm8998.sh | 2 +- .../CVE_Patchers/android_kernel_oppo_msm8974.sh | 5 ++--- .../CVE_Patchers/android_kernel_samsung_msm8974.sh | 3 +-- .../CVE_Patchers/android_kernel_zte_msm8996.sh | 2 +- Scripts/LineageOS-15.1/Functions.sh | 2 +- Scripts/LineageOS-15.1/Patch.sh | 3 --- .../CVE_Patchers/android_kernel_cyanogen_msm8974.sh | 3 +-- .../CVE_Patchers/android_kernel_fairphone_msm8974.sh | 3 +-- .../CVE_Patchers/android_kernel_google_msm.sh | 2 +- .../CVE_Patchers/android_kernel_google_wahoo.sh | 3 +-- .../CVE_Patchers/android_kernel_htc_msm8974.sh | 5 ++--- .../LineageOS-16.0/CVE_Patchers/android_kernel_lge_g3.sh | 3 +-- .../CVE_Patchers/android_kernel_lge_hammerhead.sh | 2 +- .../LineageOS-16.0/CVE_Patchers/android_kernel_lge_mako.sh | 5 ++--- .../CVE_Patchers/android_kernel_lge_msm8974.sh | 3 +-- .../CVE_Patchers/android_kernel_moto_shamu.sh | 3 +-- .../CVE_Patchers/android_kernel_motorola_msm8974.sh | 7 +++---- .../CVE_Patchers/android_kernel_motorola_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 3 ++- .../CVE_Patchers/android_kernel_oppo_msm8974.sh | 5 ++--- .../CVE_Patchers/android_kernel_razer_msm8998.sh | 2 +- .../CVE_Patchers/android_kernel_samsung_jf.sh | 5 ++--- .../CVE_Patchers/android_kernel_samsung_msm8974.sh | 3 +-- Scripts/LineageOS-16.0/Functions.sh | 2 +- .../CVE_Patchers/android_kernel_fairphone_msm8974.sh | 3 +-- .../CVE_Patchers/android_kernel_google_msm.sh | 2 +- .../CVE_Patchers/android_kernel_google_wahoo.sh | 3 +-- .../CVE_Patchers/android_kernel_htc_msm8974.sh | 5 ++--- .../LineageOS-17.1/CVE_Patchers/android_kernel_lge_g3.sh | 3 +-- .../LineageOS-17.1/CVE_Patchers/android_kernel_lge_mako.sh | 5 ++--- .../CVE_Patchers/android_kernel_lge_msm8974.sh | 3 +-- .../CVE_Patchers/android_kernel_lge_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_moto_shamu.sh | 3 +-- .../CVE_Patchers/android_kernel_motorola_msm8974.sh | 5 ++--- .../CVE_Patchers/android_kernel_motorola_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 3 ++- .../CVE_Patchers/android_kernel_oppo_msm8974.sh | 3 +-- .../CVE_Patchers/android_kernel_razer_msm8998.sh | 2 +- .../CVE_Patchers/android_kernel_samsung_jf.sh | 6 ++---- .../CVE_Patchers/android_kernel_xiaomi_sdm845.sh | 3 +-- Scripts/LineageOS-17.1/Functions.sh | 2 +- 83 files changed, 109 insertions(+), 148 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index cb35a6ce..73c380c2 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit cb35a6ce2fdbae66aedb7477f9b929f85fc87aed +Subproject commit 73c380c2b4bea1d9fa7996adaf0c03d05ca0d0aa diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index bbc275b4..d06bedad 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -46,7 +46,7 @@ commentPatches android_kernel_htc_flounder.sh "CVE-2018-9514"; commentPatches android_kernel_htc_msm8994.sh "CVE-2016-8394/ANY/0001.patch" "CVE-2017-13166"; commentPatches android_kernel_lge_msm8996.sh "CVE-2017-13162/3.18/0001.patch" "CVE-2018-17972" "CVE-2019-14070/ANY/0006.patch"; commentPatches android_kernel_motorola_msm8916.sh "0001-LinuxIncrementals/3.10/3.10.0050-0051.patch" "CVE-2018-9514"; -commentPatches android_kernel_motorola_msm8974.sh "CVE-2016-5696" "CVE-2017-7373/3.4/0001.patch"; +commentPatches android_kernel_motorola_msm8974.sh "CVE-2016-5696" "CVE-2017-7373/3.4/0001.patch" "CVE-2017-17770/3.4/0002.patch"; commentPatches android_kernel_motorola_msm8992.sh "CVE-2017-5551/3.10/0002.patch" "CVE-2017-14880/3.10/0001.patch" "CVE-2018-3585/3.10/0001.patch"; commentPatches android_kernel_motorola_msm8996.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "CVE-2017-13162/3.18/0001.patch" "CVE-2018-17972" "CVE-2019-14070/ANY/0006.patch"; commentPatches android_kernel_nextbit_msm8992.sh "CVE-2018-3585/3.10/0001.patch"; @@ -54,7 +54,7 @@ commentPatches android_kernel_oneplus_msm8994.sh "CVE-2018-3585/3.10/0001.patch" commentPatches android_kernel_oneplus_msm8996.sh "CVE-2017-13162/3.18/0001.patch" "CVE-2019-14070/ANY/0006.patch"; commentPatches android_kernel_oneplus_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-11599"; commentPatches android_kernel_oneplus_sm8150.sh "CVE-2019-16746" "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-8992"; -commentPatches android_kernel_razer_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "CVE-2019-14070/ANY/0005.patch" "CVE-2020-16166/4.4/0002.patch"; +commentPatches android_kernel_razer_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-14070/ANY/0005.patch" "CVE-2020-16166/4.4/0002.patch"; commentPatches android_kernel_samsung_smdk4412.sh "CVE-2016-8463/ANY/0001.patch"; commentPatches android_kernel_samsung_universal8890.sh "CVE-2016-7917" "CVE-2018-1092" "CVE-2018-17972"; commentPatches android_kernel_samsung_universal9810.sh "CVE-2020-1749"; diff --git a/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh b/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh index de734d80..82d86202 100644 --- a/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh +++ b/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh @@ -342,6 +342,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -369,7 +370,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2331/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9454/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9456/3.4/0002.patch 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 3eca3f50..bad02944 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 @@ -310,6 +310,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -345,7 +346,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2341/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9454/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9456/3.4/0002.patch 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 a0abfb04..10a70aea 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 @@ -26,7 +26,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9004/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0801/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2185/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2186/3.4/0002.patch @@ -153,7 +152,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -248,5 +247,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/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-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p248" +editKernelLocalversion "-dos.p247" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh index 935fd5ee..4729481a 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh @@ -288,6 +288,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -397,5 +398,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p397" +editKernelLocalversion "-dos.p398" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh index c9f473a3..219d0f3b 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh @@ -227,6 +227,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -265,7 +266,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2341/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9454/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9456/3.4/0002.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_dragon.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_dragon.sh index d4465b53..d4bc2d13 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_dragon.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_dragon.sh @@ -320,7 +320,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0011.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh index d5af0ad0..df8c27cc 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -388,7 +388,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0011.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh index 12854b70..7dab9fca 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh @@ -243,6 +243,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -271,7 +272,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2331/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9454/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9456/3.4/0002.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh index 8c849d2e..29f0e104 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -24,7 +24,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch @@ -140,7 +139,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -256,5 +255,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p256" +editKernelLocalversion "-dos.p255" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh index a46ab5dc..68624fa2 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh @@ -30,7 +30,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3857/3.4/0002.patch @@ -148,7 +147,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -263,5 +262,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p263" +editKernelLocalversion "-dos.p262" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh index 395056be..61b3e6c1 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh @@ -218,6 +218,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -250,7 +251,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9454/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9456/3.4/0002.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh index 175f0283..58791cbf 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh @@ -207,6 +207,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -304,5 +305,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/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p304" +editKernelLocalversion "-dos.p305" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh index 2005c981..4c9b215d 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh @@ -33,7 +33,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4485/^4.5.5/0001.patch @@ -105,7 +104,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/^4.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -218,5 +217,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p218" +editKernelLocalversion "-dos.p217" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh index 95cd6fa9..dcb57f7f 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -293,7 +293,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0011.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh index 88f20f72..cb422a5e 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -104,7 +104,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8569/^4.3.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch @@ -186,7 +185,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16939/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17450/^4.14.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17769/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17770/3.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17770/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17805/^4.14.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17806/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17807/3.4/0002.patch @@ -232,6 +231,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh index 4d0e7f98..49bb0437 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh @@ -374,7 +374,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0011.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh index 78bd4071..60130040 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh @@ -32,7 +32,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0801/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch @@ -174,7 +173,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -292,5 +291,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p292" +editKernelLocalversion "-dos.p291" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index 2b4c5d91..d29088f3 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -238,7 +238,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0011.patch 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 ae6ab124..0e866d95 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 @@ -23,7 +23,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2185/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2186/3.4/0002.patch @@ -107,5 +106,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/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-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p107" +editKernelLocalversion "-dos.p106" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh index 0da72cc8..62b5eab8 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh @@ -31,7 +31,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0801/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2185/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2186/3.4/0002.patch @@ -192,5 +191,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/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-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p192" +editKernelLocalversion "-dos.p191" 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 40507fdd..462b1430 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 @@ -26,7 +26,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0723/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0801/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3134/^4.5.2/0003.patch @@ -107,7 +106,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -202,5 +201,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/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-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p202" +editKernelLocalversion "-dos.p201" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh index 1909c59c..4488616c 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh @@ -22,7 +22,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4485/^4.5.5/0001.patch @@ -105,5 +104,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p105" +editKernelLocalversion "-dos.p104" 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 c65f63bd..567b32e9 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 @@ -299,7 +299,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0011.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_zte_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_zte_msm8996.sh index 16df3a27..bd5fd11a 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_zte_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_zte_msm8996.sh @@ -340,7 +340,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0011.patch diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index dafeca6a..7abedb85 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -117,7 +117,7 @@ patchWorkspace() { source build/envsetup.sh; repopick -it n_asb_09-2018-qcom; repopick -it ibss-mode-nougat; - repopick -i 287763; #update webview + repopick -i 288970; #update webview repopick -it n-asb-2020-10; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh index deb398ac..fe277a6c 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8974.sh @@ -24,7 +24,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch @@ -243,5 +242,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p243" +editKernelLocalversion "-dos.p242" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh index d5fc25e5..99520c4f 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh @@ -193,6 +193,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -229,7 +230,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2341/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9454/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9456/3.4/0002.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh index 9a99998f..b20ee687 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -192,7 +192,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0011.patch 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 03ad46e9..c977dc52 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 @@ -139,7 +139,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_wahoo.sh index 8c26c354..36cc33b5 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_wahoo.sh @@ -177,7 +177,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10323/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/4.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/4.4/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/4.4/0008.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8974.sh index 8593874b..a3ea68dd 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -24,7 +24,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch @@ -141,7 +140,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -258,5 +257,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p258" +editKernelLocalversion "-dos.p257" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_g3.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_g3.sh index 103b92b7..4e3b09f7 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_g3.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_g3.sh @@ -30,7 +30,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3857/3.4/0002.patch @@ -149,7 +148,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -265,5 +264,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p265" +editKernelLocalversion "-dos.p264" 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 9442fbce..f3817a28 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 @@ -239,6 +239,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -271,7 +272,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9454/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9456/3.4/0002.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh index d908cf81..9526ea29 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh @@ -84,7 +84,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8974.sh index e64efea3..9bebfb26 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8974.sh @@ -33,7 +33,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4485/^4.5.5/0001.patch @@ -205,5 +204,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p205" +editKernelLocalversion "-dos.p204" 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 2b60e03c..6aba3493 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 @@ -121,7 +121,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9463/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9515/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9516/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.18/0013.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0010.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh index f8e0e504..ec10a787 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -29,7 +29,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch @@ -110,7 +109,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16939/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17450/^4.14.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17558/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17769/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17770/3.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17770/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17805/^4.14.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17806/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17807/3.4/0002.patch @@ -166,7 +165,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -280,5 +279,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p280" +editKernelLocalversion "-dos.p279" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh index d8d0d28e..7364741d 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh @@ -210,7 +210,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9518/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0011.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index b76457a1..cfe9ebc9 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -166,7 +166,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9518/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0011.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh index 412361ad..0840180c 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh @@ -107,7 +107,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10323/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/4.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/4.4/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/4.4/0008.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oppo_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oppo_msm8974.sh index 41db6fa1..3a667a0a 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oppo_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oppo_msm8974.sh @@ -33,7 +33,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0774/^3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0801/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch @@ -117,7 +116,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -237,5 +236,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p237" +editKernelLocalversion "-dos.p236" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_msm8974.sh index 1909c59c..4488616c 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_msm8974.sh @@ -22,7 +22,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4485/^4.5.5/0001.patch @@ -105,5 +104,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p105" +editKernelLocalversion "-dos.p104" 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 37c17d85..d50adf02 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 @@ -178,7 +178,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9518/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0011.patch diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index c4e80828..3aacbf56 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -107,7 +107,7 @@ patchWorkspace() { 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; - repopick -i 287763; #update webview + repopick -i 288970; #update webview repopick -it O_asb_2020-10; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 83ea1b76..e5031e47 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -78,9 +78,6 @@ git revert --no-edit c9b0d95630b82cd0ad1a0fc633c6d59c2cb8aad7 37422f7df389f3ae5a enterAndClear "device/qcom/sepolicy"; patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH -enterAndClear "external/sonivox"; -git pull "https://github.com/LineageOS/android_external_sonivox" refs/changes/04/285904/1; #O_asb_2020-09 - enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles 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 8e826af7..7079974c 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 @@ -23,7 +23,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4485/^4.5.5/0001.patch @@ -176,5 +175,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p176" +editKernelLocalversion "-dos.p175" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fairphone_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fairphone_msm8974.sh index 04456bcc..3c630736 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fairphone_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fairphone_msm8974.sh @@ -214,7 +214,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2341/3.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9454/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9456/3.4/0002.patch @@ -284,5 +283,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p284" +editKernelLocalversion "-dos.p283" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_msm.sh index 5db537a6..ed1d5909 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_msm.sh @@ -138,7 +138,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_wahoo.sh index e93bbcb8..23b18a80 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_wahoo.sh @@ -255,7 +255,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0030/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/4.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0005.patch @@ -316,5 +315,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0004.patch -editKernelLocalversion "-dos.p316" +editKernelLocalversion "-dos.p315" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_htc_msm8974.sh index 3040d49f..6de125a7 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -24,7 +24,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch @@ -139,7 +138,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -256,5 +255,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p256" +editKernelLocalversion "-dos.p255" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_g3.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_g3.sh index 4858dd42..9d24ee22 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_g3.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_g3.sh @@ -29,7 +29,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3857/3.4/0002.patch @@ -196,5 +195,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p196" +editKernelLocalversion "-dos.p195" 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 dc069caa..55c24c9c 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 @@ -238,6 +238,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -270,7 +271,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9454/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9456/3.4/0002.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_mako.sh index 56f28080..2ef5495b 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_mako.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_mako.sh @@ -27,7 +27,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9004/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2185/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2186/3.4/0002.patch @@ -138,7 +137,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -239,5 +238,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/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-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p239" +editKernelLocalversion "-dos.p238" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_msm8974.sh index 575404d6..c5584e5a 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_msm8974.sh @@ -32,7 +32,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4485/^4.5.5/0001.patch @@ -198,5 +197,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p198" +editKernelLocalversion "-dos.p197" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_moto_shamu.sh index 80e1daf8..23a01e77 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_moto_shamu.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_moto_shamu.sh @@ -137,7 +137,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19965/^5.4.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19966/^5.1.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10773/ANY/0001.patch @@ -157,5 +156,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-ch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p157" +editKernelLocalversion "-dos.p156" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8974.sh index f8e0e504..ec10a787 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -29,7 +29,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch @@ -110,7 +109,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16939/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17450/^4.14.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17558/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17769/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17770/3.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17770/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17805/^4.14.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17806/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17807/3.4/0002.patch @@ -166,7 +165,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -280,5 +279,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p280" +editKernelLocalversion "-dos.p279" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh index 3b78c276..af393d08 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh @@ -109,7 +109,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8043/^4.15.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8087/^4.15.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.18/0013.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0011.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh index da1d3673..a0f65619 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -106,7 +106,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8043/^4.15.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8087/^4.15.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.18/0013.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0011.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh index 1a95986b..82616a84 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh @@ -77,6 +77,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000026/4.8+/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000026/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0136/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0136/4.14/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0145/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0154/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0154/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-1999/4.14/0003.patch @@ -355,5 +356,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.14/0004.patch -editKernelLocalversion "-dos.p355" +editKernelLocalversion "-dos.p356" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oppo_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oppo_msm8974.sh index a7b61a2e..8e8435fb 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oppo_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oppo_msm8974.sh @@ -32,7 +32,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0774/^3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0801/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch @@ -116,7 +115,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -236,5 +235,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p236" +editKernelLocalversion "-dos.p235" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh index a8deeb1b..26be84ba 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh @@ -11,7 +11,7 @@ git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0013.patch #git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0014.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0015.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0018.patch -git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0019.patch +#git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9900/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7837/ANY/0001.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_jf.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_jf.sh index 1cc200e8..45cc7b38 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_jf.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_jf.sh @@ -27,7 +27,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2185/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2186/3.4/0002.patch @@ -146,7 +145,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/^4.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -246,5 +245,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/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-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p246" +editKernelLocalversion "-dos.p245" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_msm8974.sh index 6762a848..7fdf2a49 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_msm8974.sh @@ -21,7 +21,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4485/^4.5.5/0001.patch @@ -102,5 +101,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p102" +editKernelLocalversion "-dos.p101" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 1dceede5..59d7e8fc 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -132,7 +132,7 @@ patchWorkspace() { source build/envsetup.sh; repopick -it hh-p-sepolicy; repopick -i 232948; #wahoo: liblight: close fd - repopick -i 287763; #update webview + repopick -i 288970; #update webview repopick -it P_asb-2020-10; source "$DOS_SCRIPTS/Patch.sh"; diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh index e8a5c95e..70d48423 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh @@ -21,7 +21,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4485/^4.5.5/0001.patch @@ -121,5 +120,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p121" +editKernelLocalversion "-dos.p120" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm.sh index 5db537a6..ed1d5909 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm.sh @@ -138,7 +138,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_wahoo.sh index 7b8b91b4..4d4f2696 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_wahoo.sh @@ -92,7 +92,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19947/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20810/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/4.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0005.patch @@ -147,5 +146,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0004.patch -editKernelLocalversion "-dos.p147" +editKernelLocalversion "-dos.p146" 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 3040d49f..6de125a7 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 @@ -24,7 +24,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch @@ -139,7 +138,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -256,5 +255,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p256" +editKernelLocalversion "-dos.p255" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_g3.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_g3.sh index 4858dd42..9d24ee22 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_g3.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_g3.sh @@ -29,7 +29,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3857/3.4/0002.patch @@ -196,5 +195,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p196" +editKernelLocalversion "-dos.p195" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_mako.sh index 56f28080..2ef5495b 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_mako.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_mako.sh @@ -27,7 +27,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9004/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2185/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2186/3.4/0002.patch @@ -138,7 +137,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -239,5 +238,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/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-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p239" +editKernelLocalversion "-dos.p238" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8974.sh index 575404d6..c5584e5a 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8974.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8974.sh @@ -32,7 +32,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0806/prima/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4485/^4.5.5/0001.patch @@ -198,5 +197,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p198" +editKernelLocalversion "-dos.p197" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh index 6c71ec29..9cb95947 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -113,7 +113,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9463/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9515/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9516/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.18/0013.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0010.patch diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh index 80e1daf8..23a01e77 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_moto_shamu.sh @@ -137,7 +137,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19965/^5.4.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19966/^5.1.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10773/ANY/0001.patch @@ -157,5 +156,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-ch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p157" +editKernelLocalversion "-dos.p156" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8974.sh index 627f35cb..41e9eb14 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -27,7 +27,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch @@ -101,7 +100,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16643/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16939/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17450/^4.14.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17770/3.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17770/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17805/^4.14.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17806/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17807/3.4/0002.patch @@ -252,5 +251,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p252" +editKernelLocalversion "-dos.p251" 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 3b78c276..af393d08 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 @@ -109,7 +109,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8043/^4.15.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8087/^4.15.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.18/0013.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10878/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.18/0011.patch diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh index 64171f03..620e47f4 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh @@ -53,6 +53,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20976/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-21008/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0136/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0136/4.14/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0145/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0154/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0154/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2181/4.14/0005.patch @@ -274,5 +275,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.14/0004.patch -editKernelLocalversion "-dos.p274" +editKernelLocalversion "-dos.p275" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oppo_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oppo_msm8974.sh index a12e1ba2..7ad46e14 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oppo_msm8974.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oppo_msm8974.sh @@ -32,7 +32,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0774/^3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0801/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch @@ -134,5 +133,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p134" +editKernelLocalversion "-dos.p133" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_razer_msm8998.sh index 688a665c..d11b56e8 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_razer_msm8998.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_razer_msm8998.sh @@ -10,7 +10,7 @@ git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0013.patch #git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0014.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0015.patch -git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0019.patch +#git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7837/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/^4.6.3/0003.patch diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_jf.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_jf.sh index 9120e7ef..95687480 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_jf.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_jf.sh @@ -27,7 +27,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2185/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2186/3.4/0002.patch @@ -146,7 +145,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/^4.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch @@ -174,7 +173,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2331/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9454/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9456/3.4/0002.patch @@ -246,5 +244,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-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p246" +editKernelLocalversion "-dos.p244" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index 0f60b148..6310921f 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -60,6 +60,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3674/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/4.9/0005.patch -editKernelLocalversion "-dos.p61" +editKernelLocalversion "-dos.p60" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index bfe4c9b0..9b2ea5a6 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -117,7 +117,7 @@ patchWorkspace() { source build/envsetup.sh; repopick -i 287339; #releasetools: python3 fix - repopick -i 287763; #update webview + repopick -i 288970; #update webview #repopick -it CVE-2019-2306; source "$DOS_SCRIPTS/Patch.sh";