From db3b42ae4f0001d7241271b26d2bf18fcafa1499 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Wed, 8 Aug 2018 20:23:26 -0400
Subject: [PATCH] Update CVE patchers + misc fixes

---
 Patches/Linux                                             | 2 +-
 Scripts/Common/Functions.sh                               | 8 +++++---
 .../CVE_Patchers/android_kernel_asus_fugu.sh              | 4 +++-
 .../CVE_Patchers/android_kernel_asus_msm8916.sh           | 4 +++-
 .../CVE_Patchers/android_kernel_google_dragon.sh          | 4 +++-
 .../CVE_Patchers/android_kernel_google_marlin.sh          | 4 +++-
 .../CVE_Patchers/android_kernel_htc_msm8994.sh            | 4 +++-
 .../CVE_Patchers/android_kernel_huawei_angler.sh          | 4 +++-
 .../CVE_Patchers/android_kernel_lge_bullhead.sh           | 4 +++-
 .../CVE_Patchers/android_kernel_lge_msm8996.sh            | 4 +++-
 .../CVE_Patchers/android_kernel_motorola_msm8916.sh       | 4 +++-
 .../CVE_Patchers/android_kernel_motorola_msm8974.sh       | 3 ++-
 .../CVE_Patchers/android_kernel_motorola_msm8992.sh       | 4 +++-
 .../CVE_Patchers/android_kernel_motorola_msm8996.sh       | 4 +++-
 .../CVE_Patchers/android_kernel_nextbit_msm8992.sh        | 4 +++-
 .../CVE_Patchers/android_kernel_samsung_universal8890.sh  | 5 ++++-
 Scripts/LineageOS-14.1/Functions.sh                       | 4 ++--
 .../CVE_Patchers/android_kernel_asus_fugu.sh              | 4 +++-
 .../CVE_Patchers/android_kernel_google_dragon.sh          | 4 +++-
 .../CVE_Patchers/android_kernel_google_marlin.sh          | 4 +++-
 .../CVE_Patchers/android_kernel_htc_flounder.sh           | 4 +++-
 .../CVE_Patchers/android_kernel_huawei_angler.sh          | 4 +++-
 .../CVE_Patchers/android_kernel_lge_bullhead.sh           | 4 +++-
 .../CVE_Patchers/android_kernel_lge_msm8996.sh            | 4 +++-
 .../CVE_Patchers/android_kernel_moto_shamu.sh             | 4 +++-
 .../CVE_Patchers/android_kernel_motorola_msm8974.sh       | 3 ++-
 .../CVE_Patchers/android_kernel_motorola_msm8992.sh       | 4 +++-
 .../CVE_Patchers/android_kernel_motorola_msm8996.sh       | 4 +++-
 .../CVE_Patchers/android_kernel_nextbit_msm8992.sh        | 4 +++-
 Scripts/LineageOS-15.1/Functions.sh                       | 1 +
 30 files changed, 86 insertions(+), 32 deletions(-)

diff --git a/Patches/Linux b/Patches/Linux
index a1427d3b..f60e82ef 160000
--- a/Patches/Linux
+++ b/Patches/Linux
@@ -1 +1 @@
-Subproject commit a1427d3b5f106a2f60774f9842e58a3f18bdec41
+Subproject commit f60e82ef3c6bb010a2cd42ec2deade8814eb6d4c
diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh
index 98a4fc64..8057568f 100644
--- a/Scripts/Common/Functions.sh
+++ b/Scripts/Common/Functions.sh
@@ -139,10 +139,11 @@ enhanceLocation() {
 		deviceDir=$(sed 's|gps/gps.conf||' <<< "$gpsConfig");
 		deviceDir=$(sed 's|configs/gps.conf||' <<< "$deviceDir");
 		deviceDir=$(sed 's|gps/etc/gps.conf||' <<< "$deviceDir");
+		deviceDir=$(sed 's|gps.conf||' <<< "$deviceDir");
 	else
 		deviceDir=$(dirname "$gpsConfig");
 	fi;
-	#Debugging
+	#Debugging (adb logcat | grep -i -e locsvc -e izat -e gps -e geo -e location)
 	#sed -i 's|DEBUG_LEVEL = .|DEBUG_LEVEL = 4|' "$gpsConfig" &> /dev/null || true;
 	#Enable GLONASS
 	if [ "$DOS_GPS_GLONASS_FORCED" = true ]; then
@@ -151,7 +152,7 @@ enhanceLocation() {
 	sed -i 's|A_GLONASS_POS_PROTOCOL_SELECT=0.*</item>|A_GLONASS_POS_PROTOCOL_SELECT=15</item>|' "$deviceDir"overlay/frameworks/base/core/res/res/values*/*.xml &>/dev/null || true;
 	fi;
 	#Change capabilities
-	sed -i 's|CAPABILITIES=.*|CAPABILITIES=0x15|' "$gpsConfig" &> /dev/null || true; #Disable (?) MSA and Geofencing
+	sed -i 's|CAPABILITIES=.*|CAPABILITIES=0x33|' "$gpsConfig" &> /dev/null || true; #Disable (?) MSA. 0x20 is used for both ULP and geofencing
 	#Change servers
 	sed -i "s|SUPL_HOST=.*|SUPL_HOST=$DOS_GPS_SUPL_HOST|" "$gpsConfig" &> /dev/null || true;
 	sed -i "s|NTP_SERVER=.*|NTP_SERVER=$DOS_GPS_NTP_SERVER|" "$gpsConfig" &> /dev/null || true;
@@ -159,8 +160,9 @@ enhanceLocation() {
 	#XTRA: Only use specified URLs
 	sed -i 's|XTRA_SERVER_QUERY=1|XTRA_SERVER_QUERY=0|' "$gpsConfig" &>/dev/null || true;
 	sed -i 's|#XTRA_SERVER|XTRA_SERVER|' "$gpsConfig" &>/dev/null || true;
-	#XTRA: Enable HTTPS
+	#Enable HTTPS (IZatCloud, gpsOneExtra, and GLPals all support HTTPS)
 	sed -i 's|http://xtra|https://xtra|' "$deviceDir"overlay/frameworks/base/core/res/res/values*/*.xml "$gpsConfig" &>/dev/null || true;
+	sed -i 's|http://gllto|https://gllto|' "$deviceDir"overlay/frameworks/base/core/res/res/values*/*.xml "$gpsConfig" &>/dev/null || true;
 	#XTRA: Use format version 3 if possible
 	if grep -sq "XTRA_VERSION_CHECK" "$gpsConfig"; then #Using hardware/qcom/gps OR precompiled blob OR device specific implementation
 		sed -i 's|XTRA_VERSION_CHECK=0|XTRA_VERSION_CHECK=1|' "$gpsConfig" &>/dev/null || true;
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 22a38124..8bc9b4d4 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
@@ -146,11 +146,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8890/3.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9242/^4.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch
+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-9383/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/ANY/0001.patch
 #git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch
-editKernelLocalversion "-dos.p152"
+editKernelLocalversion "-dos.p154"
 cd "$DOS_BUILD_BASE"
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 c34a7056..4a76eab8 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
@@ -69,6 +69,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9723/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.10/0001.patch
+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-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/0002.patch
@@ -78,5 +80,5 @@ git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/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
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p78"
+editKernelLocalversion "-dos.p80"
 cd "$DOS_BUILD_BASE"
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 d35b3131..e34b3ff7 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
@@ -136,6 +136,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9698/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3575/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8897/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9363/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9383/ANY/0001.patch
@@ -150,5 +152,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0007-USB-usbip-fix-potential-out
 git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p150"
+editKernelLocalversion "-dos.p152"
 cd "$DOS_BUILD_BASE"
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 8e05bf2f..5d25c3c5 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
@@ -226,6 +226,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3561/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3570/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3599/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5831/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5848/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5849/ANY/0001.patch
@@ -254,5 +256,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15845/ANY/0001.patch
-editKernelLocalversion "-dos.p254"
+editKernelLocalversion "-dos.p256"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh
index 7fe4f5c5..227d2e66 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
@@ -113,6 +113,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3584/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3597/ANY/0001.patch
+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-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
@@ -125,5 +127,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch
-editKernelLocalversion "-dos.p125"
+editKernelLocalversion "-dos.p127"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh
index 96296980..514efd75 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh
@@ -164,6 +164,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3561/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3584/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3597/ANY/0001.patch
+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-5825/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5832/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/ANY/0001.patch
@@ -175,5 +177,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/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
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15845/ANY/0001.patch
-editKernelLocalversion "-dos.p175"
+editKernelLocalversion "-dos.p177"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh
index 39a0c108..2520925b 100644
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh
@@ -161,6 +161,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3561/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3584/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3597/ANY/0001.patch
+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-5825/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5832/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/ANY/0001.patch
@@ -171,5 +173,5 @@ git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.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
-editKernelLocalversion "-dos.p171"
+editKernelLocalversion "-dos.p173"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh
index 60517648..cb957780 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
@@ -134,6 +134,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11266/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3570/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3599/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5825/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5831/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5848/ANY/0001.patch
@@ -160,5 +162,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p160"
+editKernelLocalversion "-dos.p162"
 cd "$DOS_BUILD_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 07243b1c..accfa548 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
@@ -73,10 +73,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7541/3.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.10/0001.patch
+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/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.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
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p78"
+editKernelLocalversion "-dos.p80"
 cd "$DOS_BUILD_BASE"
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 1828196f..61d6fe49 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
@@ -10,6 +10,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3153/ANY/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-1593/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3865/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5696/3.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6672/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8406/ANY/0001.patch
@@ -53,5 +54,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p53"
+editKernelLocalversion "-dos.p54"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
index 9428dd9e..65a56605 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
@@ -208,6 +208,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3570/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3584/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3597/ANY/0001.patch
+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-5858/ANY/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
@@ -219,5 +221,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15845/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8281/3.10/0003.patch
-editKernelLocalversion "-dos.p219"
+editKernelLocalversion "-dos.p221"
 cd "$DOS_BUILD_BASE"
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 c3403cff..2dd229f3 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
@@ -215,6 +215,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3570/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3598/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3599/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5831/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5848/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5849/ANY/0001.patch
@@ -241,5 +243,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p241"
+editKernelLocalversion "-dos.p243"
 cd "$DOS_BUILD_BASE"
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 13aeb8eb..7a6c7cee 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
@@ -72,6 +72,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.10/0001.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-3597/ANY/0001.patch
+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-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
@@ -82,5 +84,5 @@ git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/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
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p82"
+editKernelLocalversion "-dos.p84"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh
index 2ba392da..4a982fa3 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
@@ -56,6 +56,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3775/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3857/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4794/3.18+/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4794/3.18+/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5696/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6828/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7042/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5/0002.patch
@@ -133,6 +134,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7618/^4.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9698/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9363/ANY/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
@@ -145,5 +148,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0007-USB-usbip-fix-potential-out
 git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch
-editKernelLocalversion "-dos.p145"
+editKernelLocalversion "-dos.p148"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh
index 942280a1..298e8fd3 100644
--- a/Scripts/LineageOS-14.1/Functions.sh
+++ b/Scripts/LineageOS-14.1/Functions.sh
@@ -95,8 +95,8 @@ export -f buildAll;
 
 patchWorkspace() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/cm"; fi;
-	#source build/envsetup.sh;
-	#repopick -t n_asb_08-2018;
+	source build/envsetup.sh;
+	repopick -t n_asb_08-2018;
 
 	source "$DOS_SCRIPTS/Patch.sh";
 	source "$DOS_SCRIPTS/Defaults.sh";
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh
index e06ee6d4..37f80665 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh
@@ -127,10 +127,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7541/3.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9242/^4.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch
+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-9383/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/ANY/0001.patch
 #git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch
-editKernelLocalversion "-dos.p132"
+editKernelLocalversion "-dos.p134"
 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 179de0e8..bd53c52d 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
@@ -114,6 +114,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9698/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3575/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8897/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9383/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9417/ANY/0001.patch
@@ -126,5 +128,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0007-USB-usbip-fix-potential-out
 git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p126"
+editKernelLocalversion "-dos.p128"
 cd "$DOS_BUILD_BASE"
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 0b7bae76..be908615 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
@@ -101,6 +101,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7372/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9707/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5905/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5908/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5910/ANY/0001.patch
@@ -113,5 +115,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14883/ANY/0001.patch
-editKernelLocalversion "-dos.p113"
+editKernelLocalversion "-dos.p115"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh
index 5cee8306..214d5b7c 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
@@ -76,8 +76,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9242/^4.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3584/ANY/0001.patch
+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/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch
-editKernelLocalversion "-dos.p79"
+editKernelLocalversion "-dos.p81"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh
index c67ae945..4e3f9e8c 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
@@ -108,11 +108,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9242/^4.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3584/ANY/0001.patch
+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/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/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
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15845/ANY/0001.patch
-editKernelLocalversion "-dos.p114"
+editKernelLocalversion "-dos.p116"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh
index 26195620..64595181 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
@@ -99,9 +99,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9242/^4.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3584/ANY/0001.patch
+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/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.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
-editKernelLocalversion "-dos.p103"
+editKernelLocalversion "-dos.p105"
 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 42642f86..f0d3f33a 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
@@ -62,6 +62,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5669/^4.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5972/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6001/^4.9/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/^4.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5849/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9363/ANY/0001.patch
@@ -70,5 +72,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p70"
+editKernelLocalversion "-dos.p72"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh
index d70731dd..be5fd303 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
@@ -61,8 +61,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9242/^4.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3584/ANY/0001.patch
+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/LVT-2017-0003/3.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p64"
+editKernelLocalversion "-dos.p66"
 cd "$DOS_BUILD_BASE"
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 1828196f..61d6fe49 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
@@ -10,6 +10,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3153/ANY/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-1593/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3865/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5696/3.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6672/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8406/ANY/0001.patch
@@ -53,5 +54,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p53"
+editKernelLocalversion "-dos.p54"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
index 0160babf..29cb6069 100644
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8992.sh
@@ -73,6 +73,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.10/0001.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-3597/ANY/0001.patch
+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-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
@@ -83,5 +85,5 @@ git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/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
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p83"
+editKernelLocalversion "-dos.p85"
 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 6a22a598..bfdea261 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
@@ -97,6 +97,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3560/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3585/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3599/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5825/3.18/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5831/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5832/3.18/0002.patch
@@ -120,5 +122,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14883/ANY/0001.patch
-editKernelLocalversion "-dos.p120"
+editKernelLocalversion "-dos.p122"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh
index 13aeb8eb..7a6c7cee 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
@@ -72,6 +72,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.10/0001.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-3597/ANY/0001.patch
+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-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
@@ -82,5 +84,5 @@ git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/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
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
-editKernelLocalversion "-dos.p82"
+editKernelLocalversion "-dos.p84"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh
index 73c170b1..4393cc8f 100644
--- a/Scripts/LineageOS-15.1/Functions.sh
+++ b/Scripts/LineageOS-15.1/Functions.sh
@@ -85,6 +85,7 @@ patchWorkspace() {
 	if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
 
 	source build/envsetup.sh;
+	repopick -t o_asb_2018-08;
 	#repopick 219020 219022; #ab-neverallow-user
 	repopick -f 214824 209584 209585 215010 214300; #g3-common
 	repopick -f 211404 211405 211406 211407 211408 211409; #d852