From 688f4dd953b706d4e0593978e6118934884fbed7 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Thu, 15 Oct 2020 16:43:49 -0400
Subject: [PATCH] More CVE patcher fixes

---
 Patches/Linux                                      |  2 +-
 Scripts/Common/Fix_CVE_Patchers.sh                 | 14 +++++++-------
 Scripts/Common/Functions.sh                        |  4 ++--
 .../android_kernel_amazon_hdx-common.sh            |  1 -
 .../android_kernel_cyanogen_msm8974.sh             |  1 -
 .../android_kernel_fairphone_msm8974.sh            |  1 -
 .../CVE_Patchers/android_kernel_google_msm.sh      |  1 -
 .../CVE_Patchers/android_kernel_htc_msm8974.sh     |  1 -
 .../CVE_Patchers/android_kernel_lge_g3.sh          |  1 -
 .../CVE_Patchers/android_kernel_lge_msm8974.sh     |  1 -
 .../CVE_Patchers/android_kernel_moto_shamu.sh      |  1 -
 .../android_kernel_motorola_msm8974.sh             |  1 -
 .../CVE_Patchers/android_kernel_oneplus_msm8974.sh |  1 -
 .../CVE_Patchers/android_kernel_samsung_msm8974.sh |  1 -
 .../android_kernel_cyanogen_msm8974.sh             |  1 -
 .../android_kernel_fairphone_msm8974.sh            |  1 -
 .../CVE_Patchers/android_kernel_google_dragon.sh   |  2 +-
 .../CVE_Patchers/android_kernel_google_msm.sh      |  1 -
 .../CVE_Patchers/android_kernel_htc_msm8974.sh     |  1 -
 .../CVE_Patchers/android_kernel_htc_msm8994.sh     |  4 ++--
 .../CVE_Patchers/android_kernel_lge_g3.sh          |  1 -
 .../CVE_Patchers/android_kernel_lge_mako.sh        |  1 -
 .../CVE_Patchers/android_kernel_lge_msm8974.sh     |  1 -
 .../CVE_Patchers/android_kernel_lge_msm8996.sh     |  2 +-
 .../CVE_Patchers/android_kernel_moto_shamu.sh      |  1 -
 .../android_kernel_motorola_msm8974.sh             |  1 -
 .../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    |  1 -
 .../CVE_Patchers/android_kernel_samsung_msm8974.sh |  1 -
 .../CVE_Patchers/android_kernel_zte_msm8996.sh     |  8 ++++----
 .../android_kernel_cyanogen_msm8974.sh             |  1 -
 .../android_kernel_fairphone_msm8974.sh            |  1 -
 .../CVE_Patchers/android_kernel_google_msm.sh      |  1 -
 .../CVE_Patchers/android_kernel_htc_msm8974.sh     |  1 -
 .../CVE_Patchers/android_kernel_lge_g3.sh          |  1 -
 .../CVE_Patchers/android_kernel_lge_msm8974.sh     |  1 -
 .../CVE_Patchers/android_kernel_moto_shamu.sh      |  1 -
 .../android_kernel_motorola_msm8974.sh             |  1 -
 .../android_kernel_motorola_msm8996.sh             |  2 +-
 .../CVE_Patchers/android_kernel_oneplus_msm8996.sh |  2 +-
 .../CVE_Patchers/android_kernel_oppo_msm8974.sh    |  1 -
 .../CVE_Patchers/android_kernel_samsung_msm8974.sh |  1 -
 .../android_kernel_fairphone_msm8974.sh            |  1 -
 .../CVE_Patchers/android_kernel_google_msm.sh      |  1 -
 .../CVE_Patchers/android_kernel_htc_msm8974.sh     |  1 -
 .../CVE_Patchers/android_kernel_lge_g3.sh          |  1 -
 .../CVE_Patchers/android_kernel_lge_msm8974.sh     |  1 -
 .../CVE_Patchers/android_kernel_lge_msm8996.sh     |  2 +-
 .../CVE_Patchers/android_kernel_moto_shamu.sh      |  1 -
 .../android_kernel_motorola_msm8974.sh             |  1 -
 .../android_kernel_motorola_msm8996.sh             |  2 +-
 .../CVE_Patchers/android_kernel_oneplus_msm8996.sh |  2 +-
 .../CVE_Patchers/android_kernel_oppo_msm8974.sh    |  1 -
 .../CVE_Patchers/android_kernel_samsung_msm8974.sh |  1 -
 56 files changed, 26 insertions(+), 67 deletions(-)

diff --git a/Patches/Linux b/Patches/Linux
index f22af938..c4909b23 160000
--- a/Patches/Linux
+++ b/Patches/Linux
@@ -1 +1 @@
-Subproject commit f22af938022fed635c6e3108375728f4e58c8e90
+Subproject commit c4909b23fa00b9cfe6140ac8cdf94c7da4336d21
diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh
index d589f658..e28e1b67 100644
--- a/Scripts/Common/Fix_CVE_Patchers.sh
+++ b/Scripts/Common/Fix_CVE_Patchers.sh
@@ -38,24 +38,24 @@ commentPatches android_kernel_essential_msm8998.sh "0008-Graphene-Kernel_Hardeni
 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" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972";
+commentPatches android_kernel_google_dragon.sh "CVE-2015-4167/^3.19.1/0001.patch" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972" "CVE-2019-2214";
 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-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_htc_msm8994.sh "CVE-2016-8394/ANY/0001.patch" "CVE-2017-13166" "CVE-2018-3585" "CVE-2018-9514";
 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_lge_msm8996.sh "CVE-2016-6198" "CVE-2017-13162/3.18/0001.patch" "CVE-2018-17972" "CVE-2019-2214" "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" "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-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_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-2214" "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_msm8996.sh "CVE-2017-13162/3.18/0001.patch" "CVE-2017-16939" "CVE-2018-17972" "CVE-2019-2214" "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" "CVE-2020-16166";
 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";
@@ -63,5 +63,5 @@ commentPatches android_kernel_samsung_universal8890.sh "CVE-2016-7917" "CVE-2018
 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_zte_msm8996.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "CVE-2017-13162" "CVE-2017-16939" "CVE-2018-17972" "CVE-2019-2214" "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/Common/Functions.sh b/Scripts/Common/Functions.sh
index 95ce42db..037310d3 100644
--- a/Scripts/Common/Functions.sh
+++ b/Scripts/Common/Functions.sh
@@ -469,7 +469,7 @@ hardenUserdata() {
 	#TODO: Ensure: noatime,nosuid,nodev
 	sed -i '/\/data/{/discard/!s|nosuid|discard,nosuid|}' fstab.* root/fstab.* rootdir/fstab.* rootdir/*/fstab.* &>/dev/null || true;
 	if [ "$1" != "device/samsung/tuna" ]; then #tuna needs first boot to init
-		sed -i 's|encryptable=/|forceencrypt=/|' fstab.* root/fstab.* rootdir/fstab.* rootdir/*/fstab.* &>/dev/null || true;
+		sed -i 's|encryptable=|forceencrypt=|' fstab.* root/fstab.* rootdir/fstab.* rootdir/*/fstab.* &>/dev/null || true;
 	fi;
 	echo "Hardened /data for $1";
 	cd "$DOS_BUILD_BASE";
@@ -630,7 +630,7 @@ hardenDefconfig() {
 
 	#Enable supported options
 	#Disabled: DEBUG_SG (bootloops - https://patchwork.kernel.org/patch/8989981)
-	declare -a optionsYes=("ARM64_PTR_AUTH" "ARM64_SW_TTBR0_PAN" "ARM64_UAO" "ASYMMETRIC_KEY_TYPE" "ASYMMETRIC_PUBLIC_KEY_SUBTYPE" "BUG" "BUG_ON_DATA_CORRUPTION" "CC_STACKPROTECTOR" "CC_STACKPROTECTOR_STRONG" "CPU_SW_DOMAIN_PAN" "DEBUG_CREDENTIALS" "DEBUG_KERNEL" "DEBUG_LIST" "DEBUG_NOTIFIERS" "DEBUG_RODATA" "DEBUG_SET_MODULE_RONX" "DEBUG_VIRTUAL" "DEBUG_WX" "FORTIFY_SOURCE" "HARDEN_BRANCH_PREDICTOR" "HARDENED_USERCOPY" "HARDEN_EL2_VECTORS" "INIT_ON_ALLOC_DEFAULT_ON" "INIT_ON_FREE_DEFAULT_ON" "INIT_STACK_ALL" "IO_STRICT_DEVMEM" "IPV6_PRIVACY" "KAISER" "KGSL_PER_PROCESS_PAGE_TABLE" "LEGACY_VSYSCALL_NONE" "MMC_SECDISCARD" "PAGE_POISONING" "PAGE_POISONING_NO_SANITY" "PAGE_POISONING_ZERO" "PAGE_TABLE_ISOLATION" "PANIC_ON_OOPS" "PKCS7_MESSAGE_PARSER" "RANDOMIZE_BASE" "RANDOMIZE_MEMORY" "REFCOUNT_FULL" "RETPOLINE" "RODATA_FULL_DEFAULT_ENABLED" "SCHED_STACK_END_CHECK" "SECCOMP" "SECCOMP_FILTER" "SECURITY" "SECURITY_DMESG_RESTRICT" "SECURITY_PERF_EVENTS_RESTRICT" "SECURITY_YAMA" "SECURITY_YAMA_STACKED" "SHUFFLE_PAGE_ALLOCATOR" "SLAB_FREELIST_HARDENED" "SLAB_FREELIST_RANDOM" "SLAB_HARDENED" "SLUB_DEBUG" "SLUB_HARDENED" "STACKPROTECTOR" "STACKPROTECTOR_PER_TASK" "STACKPROTECTOR_STRONG" "STATIC_USERMODEHELPER" "STRICT_DEVMEM" "STRICT_KERNEL_RWX" "STRICT_MEMORY_RWX" "STRICT_MODULE_RWX" "SYN_COOKIES" "SYSTEM_TRUSTED_KEYRING" "THREAD_INFO_IN_TASK" "UNMAP_KERNEL_AT_EL0" "VMAP_STACK" "X509_CERTIFICATE_PARSER")
+	declare -a optionsYes=("ARM64_PTR_AUTH" "ARM64_SW_TTBR0_PAN" "ARM64_UAO" "ASYMMETRIC_KEY_TYPE" "ASYMMETRIC_PUBLIC_KEY_SUBTYPE" "BUG" "BUG_ON_DATA_CORRUPTION" "CC_STACKPROTECTOR" "CC_STACKPROTECTOR_STRONG" "CPU_SW_DOMAIN_PAN" "DEBUG_CREDENTIALS" "DEBUG_KERNEL" "DEBUG_LIST" "DEBUG_NOTIFIERS" "DEBUG_RODATA" "DEBUG_SET_MODULE_RONX" "DEBUG_VIRTUAL" "DEBUG_WX" "FORTIFY_SOURCE" "HARDEN_BRANCH_PREDICTOR" "HARDENED_USERCOPY" "HARDEN_EL2_VECTORS" "INIT_ON_ALLOC_DEFAULT_ON" "INIT_ON_FREE_DEFAULT_ON" "INIT_STACK_ALL" "IO_STRICT_DEVMEM" "IPV6_PRIVACY" "KAISER" "KGSL_PER_PROCESS_PAGE_TABLE" "LEGACY_VSYSCALL_NONE" "MMC_SECDISCARD" "PAGE_POISONING" "PAGE_POISONING_NO_SANITY" "PAGE_POISONING_ZERO" "PAGE_TABLE_ISOLATION" "PANIC_ON_OOPS" "PKCS7_MESSAGE_PARSER" "RANDOMIZE_BASE" "RANDOMIZE_MEMORY" "REFCOUNT_FULL" "RETPOLINE" "RODATA_FULL_DEFAULT_ENABLED" "SCHED_STACK_END_CHECK" "SECCOMP" "SECCOMP_FILTER" "SECURITY" "SECURITY_DMESG_RESTRICT" "SECURITY_PERF_EVENTS_RESTRICT" "SECURITY_YAMA" "SECURITY_YAMA_STACKED" "SHUFFLE_PAGE_ALLOCATOR" "SLAB_FREELIST_HARDENED" "SLAB_FREELIST_RANDOM" "SLAB_HARDENED" "SLUB_DEBUG" "SLUB_HARDENED" "STACKPROTECTOR" "STACKPROTECTOR_PER_TASK" "STACKPROTECTOR_STRONG" "STATIC_USERMODEHELPER" "STRICT_DEVMEM" "STRICT_KERNEL_RWX" "STRICT_MEMORY_RWX" "STRICT_MODULE_RWX" "SYN_COOKIES" "SYSTEM_TRUSTED_KEYRING" "THREAD_INFO_IN_TASK" "UNMAP_KERNEL_AT_EL0" "VMAP_STACK" "X509_CERTIFICATE_PARSER");
 	#optionsYes+="GCC_PLUGINS" "GCC_PLUGIN_LATENT_ENTROPY" "GCC_PLUGIN_RANDSTRUCT" "GCC_PLUGIN_STRUCTLEAK" "GCC_PLUGIN_STRUCTLEAK_BYREF_ALL");
 	optionsYes+=("PAGE_SANITIZE" "PAGE_SANITIZE_VERIFY" "SLAB_CANARY" "SLAB_SANITIZE" "SLAB_SANITIZE_VERIFY");
 	#if [ "$DOS_DEBLOBBER_REPLACE_TIME" = true ]; then optionsYes+=("RTC_DRV_MSM" "RTC_DRV_PM8XXX" "RTC_DRV_MSM7X00A" "RTC_DRV_QPNP"); fi;
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 58a7528f..15555d98 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
@@ -415,7 +415,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/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.p417"
 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 eddb02ee..63537f9f 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
@@ -396,7 +396,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/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.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 591940c8..5ad2b72c 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
@@ -336,7 +336,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/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.p338"
 cd "$DOS_BUILD_BASE"
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 698d96f6..945734aa 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
@@ -339,7 +339,6 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch
-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.p341"
 cd "$DOS_BUILD_BASE"
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 4ef98ef8..80e06fdb 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
@@ -253,7 +253,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 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 0a38f486..0dc37c5c 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
@@ -260,7 +260,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 editKernelLocalversion "-dos.p262"
 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 a8642150..e3999119 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
@@ -216,7 +216,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 editKernelLocalversion "-dos.p218"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_moto_shamu.sh
index 7da56000..6c00ad66 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_moto_shamu.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_moto_shamu.sh
@@ -356,7 +356,6 @@ 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/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
-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.p359"
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 e59f6d1a..40c2f0f5 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
@@ -341,7 +341,6 @@ 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/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
-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.p343"
 cd "$DOS_BUILD_BASE"
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 4f4f3c13..dbc58586 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
@@ -289,7 +289,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 editKernelLocalversion "-dos.p291"
 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 ac91c9b6..7a2670ad 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
@@ -102,7 +102,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 editKernelLocalversion "-dos.p104"
 cd "$DOS_BUILD_BASE"
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 0c368722..fe2a41cc 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
@@ -240,7 +240,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 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 431c8e7c..509c949a 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
@@ -300,7 +300,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/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.p302"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh
index d45c09a4..11d58706 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
@@ -326,7 +326,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-21008/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000004/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000199/^3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000204/3.18/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/^5.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3701/3.18/0003.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 048bf89b..7bcaf26c 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
@@ -241,7 +241,6 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch
-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"
 cd "$DOS_BUILD_BASE"
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 418b3d02..59e310f8 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
@@ -255,7 +255,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 editKernelLocalversion "-dos.p257"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8994.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8994.sh
index 25fb9d77..f3f42d3e 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8994.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8994.sh
@@ -225,7 +225,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3584/ANY/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3585/3.10/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3585/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3597/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5332/^4.14.13/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5333/^4.14.13/0001.patch
@@ -246,7 +246,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_lge_g3.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_g3.sh
index 28bba3f7..d9465ddc 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
@@ -262,7 +262,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 editKernelLocalversion "-dos.p264"
 cd "$DOS_BUILD_BASE"
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 8c92d826..367be35c 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
@@ -182,7 +182,6 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch
-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.p184"
 cd "$DOS_BUILD_BASE"
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 940f99e1..27929d77 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
@@ -202,7 +202,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 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 2ce98d97..e0b3f3c4 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
@@ -197,7 +197,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0014.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0015.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2213/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2287/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2290/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2323/ANY/0001.patch
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh
index 8de2b30b..61136c53 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh
@@ -161,7 +161,6 @@ 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/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
-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.p164"
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 8f7f5e9c..d8057847 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
@@ -277,7 +277,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/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.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 d99a100b..40f35ca2 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
@@ -294,7 +294,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0014.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0015.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2213/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2215/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2287/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2290/ANY/0002.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 2e3ffe53..41fc9f41 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
@@ -235,7 +235,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0014.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0015.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2213/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2215/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2287/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2323/ANY/0001.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 675e742d..b5948d2b 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
@@ -387,7 +387,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/4.4/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.4/0005.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0003.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25211/4.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/4.4/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/4.4/0003.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 f5979555..dba8b3bb 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
@@ -234,7 +234,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 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 ac91c9b6..7a2670ad 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
@@ -102,7 +102,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 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 bf482c05..d0b2a078 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
@@ -1,6 +1,6 @@
 #!/bin/bash
 cd "$DOS_BUILD_BASE""kernel/zte/msm8996"
-git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0098-0099.patch --exclude=Makefile
+#git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0098-0099.patch --exclude=Makefile
 git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0103-0104.patch --exclude=Makefile
 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.18/0019.patch
 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.18/0020.patch
@@ -109,7 +109,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12193/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13080/3.18/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13080/3.18/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13080/3.18/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13162/3.18/0001.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13162/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/3.18/0010.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13220/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13246/ANY/0001.patch
@@ -136,7 +136,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
@@ -257,7 +257,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0014.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0015.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2213/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2215/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2287/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2323/ANY/0001.patch
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 0b81f71c..e759694d 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
@@ -173,7 +173,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 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 3339c2d5..5a005a6e 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
@@ -281,7 +281,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/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.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 22e0e65e..3a747a72 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
@@ -240,7 +240,6 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch
-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.p242"
 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 aef94f79..8363c392 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
@@ -253,7 +253,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 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 b49f9310..e3807b6c 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
@@ -193,7 +193,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 editKernelLocalversion "-dos.p195"
 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 2640e079..5f4f4b84 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
@@ -195,7 +195,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 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 ebbc3e3f..72477607 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
@@ -156,7 +156,6 @@ 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/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
-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.p159"
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 8f7f5e9c..d8057847 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
@@ -277,7 +277,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/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.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 d512ba06..5e6def8b 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
@@ -169,7 +169,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0014.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0015.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2213/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/ANY/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.18/0004.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 5565f987..b6848058 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
@@ -169,7 +169,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0014.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0015.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2213/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/ANY/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.18/0004.patch
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 0d4905c7..6c04a5ac 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
@@ -233,7 +233,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 editKernelLocalversion "-dos.p235"
 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 4852da0a..3149ecaf 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
@@ -99,7 +99,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 editKernelLocalversion "-dos.p101"
 cd "$DOS_BUILD_BASE"
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 2f32a28c..f4fb9b90 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
@@ -118,7 +118,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 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 22e0e65e..3a747a72 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
@@ -240,7 +240,6 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch
-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.p242"
 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 aef94f79..8363c392 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
@@ -253,7 +253,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 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 b49f9310..e3807b6c 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
@@ -193,7 +193,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 editKernelLocalversion "-dos.p195"
 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 2640e079..5f4f4b84 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
@@ -195,7 +195,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 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 aebe5d2c..2f1e35d4 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
@@ -191,7 +191,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0014.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0015.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2213/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2287/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2323/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2331/ANY/0003.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 ebbc3e3f..72477607 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
@@ -156,7 +156,6 @@ 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/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
-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.p159"
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 3c1d2da9..bb9e335f 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
@@ -249,7 +249,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/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.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 d512ba06..5e6def8b 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
@@ -169,7 +169,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0014.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0015.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2213/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/ANY/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.18/0004.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 2927e52e..e4b07e1a 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
@@ -143,7 +143,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0014.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0015.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2213/3.18/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2214/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3701/3.18/0003.patch
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 1bde68d9..0f98404c 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
@@ -130,7 +130,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 editKernelLocalversion "-dos.p132"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_msm8974.sh
index 4852da0a..3149ecaf 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_msm8974.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_msm8974.sh
@@ -99,7 +99,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.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/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
 editKernelLocalversion "-dos.p101"
 cd "$DOS_BUILD_BASE"