From 6c9c91941e7d03d2a217250f20184cc634a29beb Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 14 Oct 2020 09:50:10 -0400 Subject: [PATCH] Fix errors from compile test of all 14.1 kernels --- Misc/Missing_CVEs.txt | 4 +++ Patches/Linux | 2 +- Scripts/Common/Fix_CVE_Patchers.sh | 26 +++++++++++-------- .../CVE_Patchers/android_kernel_asus_fugu.sh | 2 +- .../android_kernel_cyanogen_msm8916.sh | 8 +++--- .../android_kernel_cyanogen_msm8974.sh | 2 +- .../android_kernel_fairphone_msm8974.sh | 2 +- .../android_kernel_google_dragon.sh | 6 ++--- .../android_kernel_google_marlin.sh | 8 +++--- .../android_kernel_lge_msm8992.sh | 7 +++-- .../android_kernel_lge_msm8996.sh | 8 +++--- .../android_kernel_motorola_msm8996.sh | 8 +++--- .../android_kernel_nextbit_msm8992.sh | 2 +- .../android_kernel_oneplus_msm8994.sh | 2 +- .../android_kernel_oneplus_msm8996.sh | 10 +++---- .../android_kernel_samsung_universal8890.sh | 6 ++--- .../android_kernel_zte_msm8996.sh | 10 +++---- Scripts/LineageOS-14.1/Functions.sh | 3 ++- Scripts/LineageOS-14.1/Patch.sh | 7 +++++ .../android_kernel_cyanogen_msm8916.sh | 4 +-- .../android_kernel_fairphone_msm8974.sh | 2 +- .../android_kernel_google_dragon.sh | 6 ++--- .../android_kernel_google_marlin.sh | 8 +++--- .../android_kernel_lge_msm8996.sh | 10 +++---- .../android_kernel_motorola_msm8996.sh | 6 ++--- .../android_kernel_oneplus_msm8994.sh | 2 +- .../android_kernel_oneplus_msm8996.sh | 8 +++--- .../android_kernel_zte_msm8996.sh | 10 +++---- Scripts/LineageOS-15.1/Functions.sh | 2 +- Scripts/LineageOS-15.1/Patch.sh | 1 + .../android_kernel_cyanogen_msm8916.sh | 2 +- .../android_kernel_fairphone_msm8974.sh | 2 +- .../android_kernel_google_marlin.sh | 6 ++--- .../android_kernel_motorola_msm8996.sh | 6 ++--- .../android_kernel_oneplus_msm8996.sh | 8 +++--- .../android_kernel_cyanogen_msm8916.sh | 2 +- .../android_kernel_google_marlin.sh | 2 +- .../android_kernel_lge_msm8996.sh | 10 +++---- .../android_kernel_motorola_msm8996.sh | 6 ++--- .../android_kernel_oneplus_msm8996.sh | 6 ++--- 40 files changed, 124 insertions(+), 108 deletions(-) diff --git a/Misc/Missing_CVEs.txt b/Misc/Missing_CVEs.txt index c9efe79f..639ab710 100644 --- a/Misc/Missing_CVEs.txt +++ b/Misc/Missing_CVEs.txt @@ -22,6 +22,10 @@ https://nvd.nist.gov/vuln/detail/CVE-2020-3623 https://nvd.nist.gov/vuln/detail/CVE-2020-3648 https://nvd.nist.gov/vuln/detail/CVE-2020-25639 +https://nvd.nist.gov/vuln/detail/CVE-2020-12351 +https://nvd.nist.gov/vuln/detail/CVE-2020-12352 +https://nvd.nist.gov/vuln/detail/CVE-2020-24490 + andi34 cve typos CVE-2014-0169 -> CVE-2014-0196 CVE-2015-0565 -> CVE-2015-0569 diff --git a/Patches/Linux b/Patches/Linux index 15a1b607..dbaafcbf 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 15a1b607324cec8f7c43f32cfc024efea8671279 +Subproject commit dbaafcbf18a08e40ee975cf8475fb357ad5fee67 diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index 0bea3acd..d589f658 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -28,36 +28,40 @@ commentPatches() { fi; } -commentPatches android_kernel_asus_fugu.sh "CVE-2015-8746/^4.2.2/0001.patch" "LVT-2017-0003/3.10/0001.patch"; +commentPatches android_kernel_asus_fugu.sh "CVE-2015-8746/^4.2.2/0001.patch" "CVE-2017-5551" "LVT-2017-0003/3.10/0001.patch"; commentPatches android_kernel_asus_grouper.sh "CVE-2017-15868"; commentPatches android_kernel_asus_msm8916.sh "CVE-2018-13913/ANY/0001.patch"; commentPatches android_kernel_asus_msm8953.sh "CVE-2017-13162/3.18/0001.patch"; -commentPatches android_kernel_cyanogen_msm8916.sh "CVE-2018-13913/ANY/0001.patch"; +commentPatches android_kernel_cyanogen_msm8916.sh "CVE-2018-13913/ANY/0001.patch" "CVE-2018-5897" "CVE-2018-9514" "CVE-2018-11266"; +commentPatches android_kernel_cyanogen_msm8974.sh "CVE-2017-7373"; commentPatches android_kernel_essential_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2017-13218" "CVE-2019-14047/ANY/0002.patch"; +commentPatches android_kernel_fairphone_msm8974.sh "CVE-2018-20169"; commentPatches android_kernel_fxtec_msm8998.sh "CVE-2019-11599" "CVE-2019-16746" "CVE-2019-18282" "CVE-2019-19319" "CVE-2019-ctnl-addr-leak" "CVE-2020-0429" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166"; commentPatches android_kernel_google_bonito.sh "CVE-2020-0067"; -commentPatches android_kernel_google_dragon.sh "CVE-2015-4167/^3.19.1/0001.patch"; +commentPatches android_kernel_google_dragon.sh "CVE-2015-4167/^3.19.1/0001.patch" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972"; commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067"; -commentPatches android_kernel_google_marlin.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "0006-Copperhead-Kernel_Hardening/3.18/0048.patch" "0006-Copperhead-Kernel_Hardening/3.18/0049.patch" "CVE-2017-13162/3.18/0001.patch" "CVE-2019-16746" "CVE-2020-16166"; +commentPatches android_kernel_google_marlin.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "0006-Copperhead-Kernel_Hardening/3.18/0048.patch" "0006-Copperhead-Kernel_Hardening/3.18/0049.patch" "CVE-2017-13162/3.18/0001.patch" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-14381" "CVE-2020-16166"; commentPatches android_kernel_google_msm.sh "CVE-2017-11015/prima"; commentPatches android_kernel_google_msm-4.9.sh "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-1749" "CVE-2020-8992"; commentPatches android_kernel_google_wahoo.sh "CVE-2019-14047/ANY/0002.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166"; 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_lge_msm8992.sh "CVE-2018-5897" "CVE-2018-11266"; +commentPatches android_kernel_lge_msm8996.sh "CVE-2016-6198" "CVE-2017-13162/3.18/0001.patch" "CVE-2018-17972" "CVE-2019-14070/ANY/0006.patch" "CVE-2019-16746" "CVE-2020-14381" "CVE-2020-16166"; 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" "CVE-2017-17770/3.4/0002.patch"; +commentPatches android_kernel_motorola_msm8974.sh "CVE-2016-5696" "CVE-2017-7373" "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"; -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_motorola_msm8996.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "CVE-2017-8266" "CVE-2017-13162/3.18/0001.patch" "CVE-2018-17972" "CVE-2019-14070/ANY/0006.patch" "CVE-2019-16746" "CVE-2020-14381" "CVE-2020-16166"; +commentPatches android_kernel_nextbit_msm8992.sh "CVE-2018-3585/3.10/0001.patch" "CVE-2018-9514"; +commentPatches android_kernel_oneplus_msm8994.sh "CVE-2018-3585/3.10/0001.patch" "CVE-2018-9514"; +commentPatches android_kernel_oneplus_msm8996.sh "CVE-2017-13162/3.18/0001.patch" "CVE-2017-16939" "CVE-2018-17972" "CVE-2019-14070/ANY/0006.patch" "CVE-2019-16746" "CVE-2020-14381" "CVE-2020-16166"; 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" "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-14070/ANY/0005.patch" "CVE-2020-16166"; 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_universal8890.sh "CVE-2016-7917" "CVE-2018-1092" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-14381" "CVE-2020-16166"; commentPatches android_kernel_samsung_universal9810.sh "CVE-2020-1749"; commentPatches android_kernel_yandex_sdm660.sh "CVE-2019-11599" "CVE-2019-14070/ANY/0005.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166"; commentPatches android_kernel_zte_msm8930.sh "CVE-2015-2922/^3.19.6/0001.patch" "CVE-2017-11015/prima"; +commentPatches android_kernel_zte_msm8996.sh "CVE-2018-17972" "CVE-2019-14070" "CVE-2019-16746" "CVE-2020-14381" "CVE-2020-16166"; commentPatches android_kernel_zuk_msm8996.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-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-1616"; diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh index 445d5b5a..70db7dc8 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh @@ -207,7 +207,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-2584/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-2618/3.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-2671/^4.10.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5549/3.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5551/3.10/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5551/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5669/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5897/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5972/3.10/0002.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh index d2fc908a..7a7e1493 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh @@ -132,7 +132,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5750/^4.14.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5825/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5904/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7492/^4.14.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7566/^4.15/0001.patch @@ -142,7 +142,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8781/^4.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9383/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9416/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9514/ANY/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9514/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-9518/ANY/0001.patch @@ -156,7 +156,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10881/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11266/ANY/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11266/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11273/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11286/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch @@ -244,7 +244,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch 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/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.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.p247" 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 827f24cd..eddb02ee 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 @@ -193,7 +193,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7187/3.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7187/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7187/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7308/^4.10.6/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7373/3.4/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7373/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7472/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/^4.11.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7533/3.4/0006.patch 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 330df4dc..591940c8 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 @@ -253,7 +253,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16885/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18710/^4.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-19985/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20169/3.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20169/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20511/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000199/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000199/3.4/0003.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 93a6b7de..8a65a744 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 @@ -121,7 +121,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5400/^4.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5828/^4.6.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6130/^4.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6187/^4.6.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6198/^4.5.5/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6198/^4.5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6480/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5.2/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7425/3.18/0005.patch @@ -193,7 +193,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7261/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7273/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7294/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7346/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7374/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7374/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7472/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7482/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/3.18/0003.patch @@ -354,7 +354,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16276/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16862/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16884/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18386/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18690/^4.17/0001.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 560468ab..fa385ad5 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 @@ -435,7 +435,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16276/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16862/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16884/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18386/3.18/0003.patch @@ -546,7 +546,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch @@ -625,12 +625,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh index d3cf741a..f847c6f5 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh @@ -295,7 +295,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5333/^4.14.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5750/^4.14.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5825/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5904/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5908/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7492/^4.14.7/0001.patch @@ -320,7 +320,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10902/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11265/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11266/ANY/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11266/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11273/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11286/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch @@ -351,7 +351,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10491/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10519/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10607/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.10/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11486/^5.0.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/^5.0.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12456/^5.1.5/0001.patch @@ -406,7 +405,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch 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/CVE-2017-13167/3.10/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.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.p409" 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 5caec072..f454f423 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 @@ -82,7 +82,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5828/^4.6.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6130/^4.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6187/^4.6.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6197/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6198/^4.5.5/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6198/^4.5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6480/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6672/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch @@ -460,7 +460,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch @@ -540,12 +540,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.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 fd7f8403..53336290 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 @@ -166,7 +166,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8251/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8261/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8262/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8264/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8266/3.18/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8266/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8271/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8272/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8824/3.18/0003.patch @@ -529,7 +529,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch @@ -608,12 +608,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh index bd5ba1c3..f16d1495 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh @@ -126,7 +126,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8781/^4.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9383/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9416/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9514/ANY/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9514/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-9518/ANY/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh index aa7a0d63..6df9560a 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh @@ -120,7 +120,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8781/^4.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9383/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9416/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9514/ANY/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9514/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-9518/ANY/0001.patch 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 f244b73f..6869e46c 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 @@ -175,7 +175,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16911/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16914/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16939/3.18/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16939/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17450/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17558/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17805/3.18/0003.patch @@ -286,7 +286,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16276/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16862/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16884/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18386/3.18/0003.patch @@ -404,7 +404,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch @@ -484,12 +484,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch 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 4ecaf276..b711369a 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 @@ -430,7 +430,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17053/3.18/0002.patch @@ -507,12 +507,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.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 e4a6c63c..2fa907ac 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 @@ -388,7 +388,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16276/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16862/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16884/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18386/3.18/0003.patch @@ -469,7 +469,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14038/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14055/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14284/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14814/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14821/3.18/0004.patch @@ -500,7 +500,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch @@ -579,12 +579,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 7abedb85..e93c78c4 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -58,7 +58,7 @@ buildAll() { #Select devices are userdebug due to SELinux policy issues buildDeviceUserDebug thor; #broken encryption buildDevice clark; - buildDevice h815; #broken + buildDevice h815; buildDevice manta; buildDevice n7100; #broken sepolicy buildDeviceUserDebug i9300; @@ -119,6 +119,7 @@ patchWorkspace() { repopick -it ibss-mode-nougat; repopick -i 288970; #update webview repopick -it n-asb-2020-10; + repopick -it tzdb2020b_N; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index f538caea..367f95a5 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -247,6 +247,9 @@ sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.t sed -i '1itypeattribute wcnss_service misc_block_device_exception;' sepolicy/wcnss_service.te; echo "allow wcnss_service block_device:dir search;" >> sepolicy/wcnss_service.te; #fix incorrect Wi-Fi MAC address +enterAndClear "device/lge/g4-common"; +sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te; + enterAndClear "device/lge/msm8996-common"; sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te; @@ -304,9 +307,13 @@ deblobAudio; #Fix broken options enabled by hardenDefconfig() sed -i "s/# CONFIG_KPROBES is not set/CONFIG_KPROBES=y/" kernel/amazon/hdx-common/arch/arm/configs/*hdx*_defconfig; #Breaks on compile sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/google/msm/arch/arm/configs/lineageos_*_defconfig; #Breaks on compile +awk -i inplace '!/STACKPROTECTOR/' kernel/lge/msm8992/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/lge/msm8996/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/motorola/msm8974/arch/arm/configs/lineageos_*_defconfig; #Breaks on compile sed -i "s/CONFIG_ARM_SMMU=y/# CONFIG_ARM_SMMU is not set/" kernel/motorola/msm8992/arch/arm64/configs/*defconfig; #Breaks on compile +sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/motorola/msm8996/arch/arm64/configs/*defconfig; #Breaks on compile +sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/oneplus/msm8996/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile +sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/zte/msm8996/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile #tuna fixes awk -i inplace '!/nfc_enhanced.mk/' device/samsung/toro*/lineage.mk; awk -i inplace '!/TARGET_RECOVERY_UPDATER_LIBS/' device/samsung/toro*/BoardConfig.mk; diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh index ac68bb3b..5e2ee7ef 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh @@ -103,7 +103,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5750/^4.14.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5904/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7492/^4.14.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7566/^4.15/0001.patch @@ -113,7 +113,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8781/^4.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9383/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9416/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9514/ANY/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9514/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-9518/ANY/0001.patch 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 d30a36b9..431c8e7c 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 @@ -216,7 +216,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16885/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18710/^4.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-19985/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20169/3.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20169/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20511/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000199/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000199/3.4/0003.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh index bb729e6e..97ff568c 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh @@ -120,7 +120,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5400/^4.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5828/^4.6.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6130/^4.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6187/^4.6.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6198/3.18/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6198/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6480/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5.2/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7425/3.18/0005.patch @@ -181,7 +181,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7261/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7273/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7294/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7346/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7374/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7374/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7472/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7482/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/3.18/0003.patch @@ -310,7 +310,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16276/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16862/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16884/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18386/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18559/3.18/0003.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 ccd21b3f..0776b5f9 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 @@ -237,7 +237,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16276/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16862/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16884/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18386/3.18/0003.patch @@ -348,7 +348,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch @@ -429,12 +429,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch 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 a25e46d6..d31b0bf8 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 @@ -61,8 +61,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5244/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6130/^4.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6187/^4.6.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6197/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6198/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6198/3.18/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6198/3.18/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6198/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6672/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch @@ -292,7 +292,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch @@ -374,12 +374,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch 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 d78daf68..a20319bb 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 @@ -385,7 +385,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch @@ -468,12 +468,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh index dc77696e..a55d8ea6 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh @@ -99,7 +99,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7755/^4.15.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7757/^4.15.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8781/^4.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9514/ANY/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9514/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-9518/ANY/0001.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 cd46f3e8..f4d0576f 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 @@ -203,7 +203,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16276/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16862/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16884/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18386/3.18/0003.patch @@ -325,7 +325,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch @@ -408,12 +408,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch 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 75a64c66..8d3eca8e 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 @@ -224,7 +224,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16276/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16862/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16884/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18386/3.18/0003.patch @@ -322,7 +322,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14047/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14055/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14284/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14814/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14821/3.18/0004.patch @@ -353,7 +353,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch @@ -436,12 +436,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 937096f7..a3a4bb85 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -67,7 +67,6 @@ buildAll() { #The following are all superseded, and should only be enabled if the newer version is broken (not building/booting/etc.) buildDevice flo; - buildDevice hammerhead; buildDevice h850; #broken buildDevice fugu; if [ "$DOS_BUILDALL_SUPERSEDED" = true ]; then @@ -79,6 +78,7 @@ buildAll() { buildDevice d855; buildDevice FP2; buildDevice ham; + buildDevice hammerhead; buildDevice klte; buildDevice m8; buildDevice victara; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index aa81a70a..2cb8c17f 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -260,6 +260,7 @@ sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" ker sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/motorola/msm8974/arch/arm/configs/lineageos_*_defconfig; #Breaks on compile sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/motorola/msm8996/arch/arm64/configs/*_defconfig; #Breaks on compile sed -i "s/CONFIG_RANDOMIZE_BASE=y/# CONFIG_RANDOMIZE_BASE is not set/" kernel/samsung/universal9810/arch/arm64/configs/*_defconfig; #Breaks on compile +sed -i "s/CONFIG_STRICT_MEMORY_RWX=y/# CONFIG_STRICT_MEMORY_RWX is not set/" kernel/zte/msm8996/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile sed -i 's/YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10 rm -v kernel/*/*/drivers/staging/greybus/tools/Android.mk; diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh index e68792a3..c4d3d86e 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh @@ -102,7 +102,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5750/^4.14.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5904/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7492/^4.14.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7566/^4.15/0001.patch 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 a8e26744..3339c2d5 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 @@ -205,7 +205,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16885/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18710/^4.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-19985/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20169/3.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20169/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20511/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000199/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000199/3.4/0003.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_marlin.sh index 5e1e613d..91a8ae9d 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_marlin.sh @@ -210,7 +210,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch @@ -293,12 +293,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch 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 d5bd0ebf..bd65aef4 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 @@ -249,7 +249,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch @@ -331,12 +331,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.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 016de6dc..a4d83fd3 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 @@ -141,7 +141,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16276/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16862/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16884/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18690/^4.17/0001.patch @@ -245,7 +245,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch @@ -327,12 +327,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh index e68792a3..c4d3d86e 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh @@ -102,7 +102,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5750/^4.14.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5904/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7492/^4.14.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7566/^4.15/0001.patch diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh index 41a4c5b6..aa09fa6c 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -281,7 +281,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch 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 b627a42b..4218cf82 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 @@ -61,8 +61,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5244/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6130/^4.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6187/^4.6.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6197/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6198/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6198/3.18/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6198/3.18/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6198/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6672/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch @@ -285,7 +285,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch @@ -367,12 +367,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch 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 d5bd0ebf..bd65aef4 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 @@ -249,7 +249,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch @@ -331,12 +331,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index 5b7a2456..d0ba36db 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -206,7 +206,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.18/0008.patch @@ -287,12 +287,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch