From 5772b68224628eb2a9458834ea710c0b9b0f3da1 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sat, 23 Jun 2018 03:39:01 -0400
Subject: [PATCH] Update CVE patches + more globbing fixes

---
 Patches/Linux                                 |  2 +-
 Scripts/Common/Functions.sh                   |  2 +-
 .../android_kernel_asus_msm8916.sh            |  3 ++-
 .../android_kernel_htc_msm8994.sh             |  3 ++-
 .../android_kernel_lge_msm8992.sh             |  3 ++-
 .../android_kernel_lge_msm8996.sh             |  3 ++-
 .../android_kernel_motorola_msm8916.sh        |  3 ++-
 .../android_kernel_motorola_msm8992.sh        |  3 ++-
 .../android_kernel_samsung_universal8890.sh   |  3 ++-
 Scripts/LineageOS-14.1/Functions.sh           |  2 +-
 .../android_kernel_google_marlin.sh           |  3 ++-
 .../android_kernel_htc_flounder.sh            |  3 ++-
 .../android_kernel_huawei_angler.sh           |  3 ++-
 .../android_kernel_lge_bullhead.sh            |  3 ++-
 .../android_kernel_lge_msm8996.sh             | 22 +++----------------
 .../CVE_Patchers/android_kernel_moto_shamu.sh |  3 ++-
 .../android_kernel_motorola_msm8996.sh        |  3 ++-
 .../android_kernel_nextbit_msm8992.sh         |  3 ++-
 Scripts/LineageOS-15.1/Functions.sh           |  2 +-
 19 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/Patches/Linux b/Patches/Linux
index 5cc8355b..8f939c08 160000
--- a/Patches/Linux
+++ b/Patches/Linux
@@ -1 +1 @@
-Subproject commit 5cc8355bcb7b79a9d4266b851d4679d06f6a0561
+Subproject commit 8f939c08b3988d272037622994cc0eac75c12097
diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh
index 390de312..6300f1ef 100644
--- a/Scripts/Common/Functions.sh
+++ b/Scripts/Common/Functions.sh
@@ -24,7 +24,7 @@ fi;
 
 startPatcher() {
 	#$cvePatcher must be set!
-	java -jar "$cvePatcher" patch "$base" "$androidWorkspace""Patches/" "$cveScripts" "$1";
+	java -jar "$cvePatcher" patch "$base" "$androidWorkspace""Patches/" "$cveScripts" $1;
 }
 export -f startPatcher;
 
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh
index a4df6ea2..18f0c9ce 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh
@@ -64,10 +64,11 @@ git apply $cvePatchesLinux/CVE-2017-7533/3.10/0003.patch
 git apply $cvePatchesLinux/CVE-2017-8281/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch
 git apply $cvePatchesLinux/CVE-2017-9723/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch
 git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p69"
+editKernelLocalversion "-dos.p70"
 cd $base
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh
index b714a5bb..c516d1dc 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh
@@ -106,6 +106,7 @@ git apply $cvePatchesLinux/CVE-2017-8281/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch
 git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch
 git apply $cvePatchesLinux/CVE-2017-9723/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-5825/3.10/0001.patch
@@ -115,5 +116,5 @@ git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch
-editKernelLocalversion "-dos.p115"
+editKernelLocalversion "-dos.p116"
 cd $base
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh
index ed463cf8..95c0f74b 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
@@ -166,6 +166,7 @@ git apply $cvePatchesLinux/CVE-2017-9708/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2017-9720/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2017-9724/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-9725/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-5825/3.10/0001.patch
@@ -178,5 +179,5 @@ git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-15845/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch
-editKernelLocalversion "-dos.p178"
+editKernelLocalversion "-dos.p179"
 cd $base
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh
index f87dd6ea..0e7463ee 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
@@ -126,6 +126,7 @@ git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-7533/3.18/0004.patch
 git apply $cvePatchesLinux/CVE-2017-7616/^4.10/0001.patch
 git apply $cvePatchesLinux/CVE-2017-7618/^4.10/0002.patch
+git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3563/3.18/0002.patch
 git apply $cvePatchesLinux/CVE-2018-3599/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-5825/3.18/0002.patch
@@ -143,5 +144,5 @@ git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p143"
+editKernelLocalversion "-dos.p144"
 cd $base
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh
index d460c2a6..91036698 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh
@@ -74,11 +74,12 @@ git apply $cvePatchesLinux/CVE-2017-6345/^4.9/0001.patch
 git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch
 git apply $cvePatchesLinux/CVE-2017-7533/3.10/0003.patch
 git apply $cvePatchesLinux/CVE-2017-7541/3.10/0002.patch
+git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch
 git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
 git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
 git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p80"
+editKernelLocalversion "-dos.p81"
 cd $base
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
index 716f66e5..7b58a39e 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
@@ -196,6 +196,7 @@ git apply $cvePatchesLinux/CVE-2017-9708/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2017-9720/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2017-9724/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-9725/3.10/0001.patch
+git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch
 git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
@@ -206,5 +207,5 @@ git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-15845/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch
-editKernelLocalversion "-dos.p206"
+editKernelLocalversion "-dos.p207"
 cd $base
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh
index 6ddffdd8..fd124cb1 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
@@ -129,6 +129,7 @@ git apply $cvePatchesLinux/CVE-2017-7495/3.18/0002.patch
 git apply $cvePatchesLinux/CVE-2017-7616/^4.10/0001.patch
 git apply $cvePatchesLinux/CVE-2017-7618/^4.10/0002.patch
 git apply $cvePatchesLinux/CVE-2017-9698/3.18/0001.patch
+git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
 git apply $cvePatchesLinux/Untracked/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch
 git apply $cvePatchesLinux/Untracked/ANY/0004-net-add-recursion-limit-to-GRO.patch
 git apply $cvePatchesLinux/Untracked/ANY/0005-tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch
@@ -136,5 +137,5 @@ git apply $cvePatchesLinux/Untracked/ANY/0007-USB-usbip-fix-potential-out-of-bou
 git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
 git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch
-editKernelLocalversion "-dos.p136"
+editKernelLocalversion "-dos.p137"
 cd $base
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index 981b433d..f0e2fbd0 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -30,7 +30,7 @@ export -f resetWorkspace;
 scanWorkspaceForMalware() {
 	scanQueue="$base/abi $base/android $base/art $base/bionic $base/bootable $base/build $base/dalvik $base/device $base/hardware $base/libcore $base/libnativehelper $base/ndk $base/packages $base/pdk $base/platform_testing $base/sdk $base/system";
 	scanQueue=$scanQueue" $base/vendor/cm $base/vendor/cmsdk";
-	scanForMalware true "$scanQueue";
+	scanForMalware true $scanQueue;
 }
 export -f scanWorkspaceForMalware;
 
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 e9a07e31..bd8efcc9 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
@@ -99,6 +99,7 @@ git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch
 git apply $cvePatchesLinux/CVE-2017-7371/3.18/0001.patch
 git apply $cvePatchesLinux/CVE-2017-7372/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-9707/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
 git apply $cvePatchesLinux/Untracked/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch
 git apply $cvePatchesLinux/Untracked/ANY/0005-tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch
 git apply $cvePatchesLinux/CVE-2016-5853/3.18/0002.patch
@@ -107,5 +108,5 @@ git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-14883/ANY/0001.patch
-editKernelLocalversion "-dos.p107"
+editKernelLocalversion "-dos.p108"
 cd $base
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh
index c291a459..6635817a 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh
@@ -71,9 +71,10 @@ git apply $cvePatchesLinux/CVE-2017-7472/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-7533/3.10/0002.patch
 git apply $cvePatchesLinux/CVE-2017-7533/3.10/0003.patch
 git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch
+git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch
 git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
 git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
 git apply $cvePatchesLinux/CVE-2016-2475/ANY/0001.patch
-editKernelLocalversion "-dos.p75"
+editKernelLocalversion "-dos.p76"
 cd $base
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh
index d90a454c..deaccd4b 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh
@@ -105,6 +105,7 @@ git apply $cvePatchesLinux/CVE-2017-7533/3.10/0003.patch
 git apply $cvePatchesLinux/CVE-2017-8269/3.10/0002.patch
 git apply $cvePatchesLinux/CVE-2017-8280/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch
+git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch
 git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
 git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
@@ -112,5 +113,5 @@ git apply $cvePatchesLinux/CVE-2016-2475/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-15845/ANY/0001.patch
-editKernelLocalversion "-dos.p112"
+editKernelLocalversion "-dos.p113"
 cd $base
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh
index d9819b27..d18b2985 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh
@@ -96,10 +96,11 @@ git apply $cvePatchesLinux/CVE-2017-7472/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-7533/3.10/0003.patch
 git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch
+git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch
 git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
 git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
 git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
-editKernelLocalversion "-dos.p101"
+editKernelLocalversion "-dos.p102"
 cd $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 8675e335..ac59ebad 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
@@ -25,7 +25,6 @@ git apply $cvePatchesLinux/0007-Copperhead-Kernel_Hardening/3.18/0045.patch
 git apply $cvePatchesLinux/0007-Copperhead-Kernel_Hardening/3.18/0046.patch
 git apply $cvePatchesLinux/0007-Copperhead-Kernel_Hardening/3.18/0050.patch
 git apply $cvePatchesLinux/0010-Accelerated_AES/3.10+/0012.patch
-git apply $cvePatchesLinux/0012-Copperhead-Deny_USB/3.18/0002-Alt2.patch
 git apply $cvePatchesLinux/CVE-2014-9900/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2015-2041/^3.19/0002.patch
 git apply $cvePatchesLinux/CVE-2015-7515/^4.4/0002.patch
@@ -50,38 +49,23 @@ git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-11031/3.18/0001.patch
 git apply $cvePatchesLinux/CVE-2017-11045/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-11077/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2017-13162/3.18/0001.patch
-git apply $cvePatchesLinux/CVE-2017-13245/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2017-13218/3.18/0009.patch
 git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2017-15842/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2017-15843/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-15846/ANY/0002.patch
 git apply $cvePatchesLinux/CVE-2017-15857/3.18/0001.patch
 git apply $cvePatchesLinux/CVE-2017-16650/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0005.patch
 git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0006.patch
 git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0009.patch
-git apply $cvePatchesLinux/CVE-2017-17769/3.18/0002.patch
-git apply $cvePatchesLinux/CVE-2017-18066/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-5669/^4.9/0001.patch
 git apply $cvePatchesLinux/CVE-2017-5972/ANY/0002.patch
 git apply $cvePatchesLinux/CVE-2017-6001/^4.9/0002.patch
 git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch
-git apply $cvePatchesLinux/CVE-2018-3560/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2018-3563/3.18/0002.patch
-git apply $cvePatchesLinux/CVE-2018-3585/3.18/0002.patch
-git apply $cvePatchesLinux/CVE-2018-3599/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2018-5825/3.18/0002.patch
-git apply $cvePatchesLinux/CVE-2018-5831/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2018-5833/3.18/0001.patch
-git apply $cvePatchesLinux/CVE-2018-5848/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-5849/ANY/0001.patch
-git apply $cvePatchesLinux/CVE-2018-5857/ANY/0001.patch
-git apply $cvePatchesLinux/LVT-2017-0001/3.18/0004.patch
-git apply $cvePatchesLinux/LVT-2017-0002/3.18/0003.patch
 git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p83"
+editKernelLocalversion "-dos.p67"
 cd $base
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh
index dd28f501..483251d5 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
@@ -58,9 +58,10 @@ git apply $cvePatchesLinux/CVE-2017-6345/^4.9/0001.patch
 git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-8269/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch
+git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch
 git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2016-2475/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p62"
+editKernelLocalversion "-dos.p63"
 cd $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 4eb20e98..6578c0c5 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
@@ -88,6 +88,7 @@ git apply $cvePatchesLinux/CVE-2017-5972/ANY/0002.patch
 git apply $cvePatchesLinux/CVE-2017-6001/^4.9/0002.patch
 git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch
 git apply $cvePatchesLinux/CVE-2017-8251/3.18/0002.patch
+git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3560/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3563/3.18/0002.patch
 git apply $cvePatchesLinux/CVE-2018-3585/3.18/0002.patch
@@ -103,5 +104,5 @@ git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-14883/ANY/0001.patch
-editKernelLocalversion "-dos.p103"
+editKernelLocalversion "-dos.p104"
 cd $base
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh
index 77fe4450..19663f0b 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh
@@ -63,6 +63,7 @@ git apply $cvePatchesLinux/CVE-2017-8243/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2017-8281/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch
 git apply $cvePatchesLinux/CVE-2017-9723/ANY/0001.patch
+git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch
 #git apply $cvePatchesLinux/CVE-2018-3585/3.10/0001.patch
@@ -71,5 +72,5 @@ git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
 git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
 git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p71"
+editKernelLocalversion "-dos.p72"
 cd $base
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index e663932b..aa9967ff 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -30,7 +30,7 @@ export -f resetWorkspace;
 scanWorkspaceForMalware() {
 	scanQueue="$base/android $base/art $base/bionic $base/bootable $base/build $base/compatibility $base/dalvik $base/device $base/hardware $base/libcore $base/libnativehelper $base/packages $base/pdk $base/platform_testing $base/sdk $base/system";
 	scanQueue=$scanQueue" $base/lineage-sdk $base/vendor/lineage";
-	scanForMalware true "$scanQueue";
+	scanForMalware true $scanQueue;
 }
 export -f scanWorkspaceForMalware;