From 3c1931bcc9318d44caeadcc283457991174bc297 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sun, 19 Dec 2021 04:27:53 -0500
Subject: [PATCH] Update CVE patchers

Signed-off-by: Tad <tad@spotco.us>
---
 Patches/Linux                                                 | 2 +-
 .../CVE_Patchers/android_kernel_samsung_universal8890.sh      | 3 ++-
 .../CVE_Patchers/android_kernel_google_dragon.sh              | 3 ++-
 Scripts/LineageOS-16.0/Functions.sh                           | 3 +--
 Scripts/LineageOS-16.0/Patch.sh                               | 4 ----
 .../CVE_Patchers/android_kernel_google_msm-4.9.sh             | 3 ++-
 .../CVE_Patchers/android_kernel_oneplus_sm7250.sh             | 4 +++-
 .../CVE_Patchers/android_kernel_oneplus_sm8150.sh             | 4 +++-
 .../CVE_Patchers/android_kernel_xiaomi_sm6150.sh              | 4 +++-
 .../CVE_Patchers/android_kernel_yandex_sdm660.sh              | 4 +++-
 .../LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh | 4 +++-
 .../CVE_Patchers/android_kernel_essential_msm8998.sh          | 3 +--
 .../CVE_Patchers/android_kernel_fairphone_sdm632.sh           | 3 ++-
 .../CVE_Patchers/android_kernel_fxtec_msm8998.sh              | 4 +++-
 .../CVE_Patchers/android_kernel_google_coral.sh               | 4 +++-
 .../CVE_Patchers/android_kernel_google_msm-4.9.sh             | 3 ++-
 .../CVE_Patchers/android_kernel_google_redbull.sh             | 4 +++-
 .../CVE_Patchers/android_kernel_google_sunfish.sh             | 4 +++-
 .../CVE_Patchers/android_kernel_google_wahoo.sh               | 4 +++-
 .../CVE_Patchers/android_kernel_oneplus_msm8998.sh            | 4 +++-
 .../CVE_Patchers/android_kernel_oneplus_sdm845.sh             | 3 ++-
 .../CVE_Patchers/android_kernel_oneplus_sm8150.sh             | 4 +++-
 .../CVE_Patchers/android_kernel_razer_msm8998.sh              | 4 +++-
 .../CVE_Patchers/android_kernel_razer_sdm845.sh               | 3 ++-
 .../CVE_Patchers/android_kernel_xiaomi_sm8150.sh              | 4 +++-
 .../CVE_Patchers/android_kernel_xiaomi_sm8250.sh              | 4 +++-
 .../LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh | 4 +++-
 27 files changed, 65 insertions(+), 32 deletions(-)

diff --git a/Patches/Linux b/Patches/Linux
index 842004cd..d88872d1 160000
--- a/Patches/Linux
+++ b/Patches/Linux
@@ -1 +1 @@
-Subproject commit 842004cdde191e89d3083ef53f8dd4b308b8cd34
+Subproject commit d88872d14755458f348c32491706f14650f2a8ae
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 0bc6a293..3cfb9b45 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
@@ -665,6 +665,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0004-net-add-recursion-limit-to-GRO.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0005-tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch
@@ -672,5 +673,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.18/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch
-editKernelLocalversion "-dos.p672"
+editKernelLocalversion "-dos.p673"
 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 ac76cc7a..adacc9a1 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
@@ -625,6 +625,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0004/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch
 git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0003-tunnels-Don-t-apply-GRO-to-multiple-layers-of-encaps.patch
@@ -636,5 +637,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch
-editKernelLocalversion "-dos.p636"
+editKernelLocalversion "-dos.p637"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh
index 457dd0e9..997d4415 100644
--- a/Scripts/LineageOS-16.0/Functions.sh
+++ b/Scripts/LineageOS-16.0/Functions.sh
@@ -83,9 +83,8 @@ patchWorkspace() {
 	touch DOS_PATCHED_FLAG;
 	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;
+	#source build/envsetup.sh;
 	#repopick -it pie-firewall;
-	repopick -it P_asb_2021-12;
 
 	sh "$DOS_SCRIPTS/Patch.sh";
 	sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh
index 16584613..829e6634 100644
--- a/Scripts/LineageOS-16.0/Patch.sh
+++ b/Scripts/LineageOS-16.0/Patch.sh
@@ -99,10 +99,6 @@ sed -i 's/about to delete/unable to delete/' pico/src/com/svox/pico/LangPackUnin
 awk -i inplace '!/deletePackage/' pico/src/com/svox/pico/LangPackUninstaller.java;
 fi;
 
-if enterAndClear "external/tremolo"; then
-git pull https://github.com/LineageOS/android_external_tremolo refs/changes/24/320424/1; #P_asb_2021-12
-fi;
-
 if enterAndClear "frameworks/av"; then
 if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES_COMMON/android_frameworks_av/0001-HM-No_RLIMIT_AS.patch"; fi; #(GrapheneOS)
 fi;
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
index b0ef3952..daeeb6f2 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
@@ -337,9 +337,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39636/ANY/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39636/ANY/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.9/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch
-editKernelLocalversion "-dos.p341"
+editKernelLocalversion "-dos.p342"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh
index b317844d..bb465c56 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh
@@ -388,6 +388,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38300/4.19/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.19/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.19/0003.patch
@@ -403,5 +405,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.19/0011.patch
 #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch
-editKernelLocalversion "-dos.p403"
+editKernelLocalversion "-dos.p405"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
index 780b2c3c..c0cfb1df 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
@@ -433,6 +433,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38300/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.14/0002.patch
@@ -442,5 +444,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch
-editKernelLocalversion "-dos.p442"
+editKernelLocalversion "-dos.p444"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
index 02f42e93..7c04d1a3 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
@@ -185,10 +185,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38300/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch
-editKernelLocalversion "-dos.p190"
+editKernelLocalversion "-dos.p192"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh
index f9c225b8..8548d3be 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh
@@ -290,9 +290,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch
-editKernelLocalversion "-dos.p294"
+editKernelLocalversion "-dos.p296"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh
index 6b6341a9..2acd19ae 100644
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh
@@ -296,10 +296,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch
-editKernelLocalversion "-dos.p301"
+editKernelLocalversion "-dos.p303"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh
index 1889e609..225c90e3 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh
@@ -99,6 +99,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.4/0007.patch
-editKernelLocalversion "-dos.p100"
+editKernelLocalversion "-dos.p99"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh
index 72166392..043dab9b 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh
@@ -296,6 +296,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39636/ANY/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39636/ANY/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.9/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0011.patch
@@ -308,5 +309,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch
-editKernelLocalversion "-dos.p308"
+editKernelLocalversion "-dos.p309"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh
index b23f60c1..af6bbfef 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh
@@ -47,5 +47,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.4/0007.patch
-editKernelLocalversion "-dos.p47"
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch
+editKernelLocalversion "-dos.p49"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh
index b99d8a4a..643ce4b3 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh
@@ -182,10 +182,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38300/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch
-editKernelLocalversion "-dos.p187"
+editKernelLocalversion "-dos.p189"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
index f24cd48d..368e6b79 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh
@@ -191,7 +191,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.9/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch
-editKernelLocalversion "-dos.p193"
+editKernelLocalversion "-dos.p194"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh
index cda1e060..76f418a0 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh
@@ -201,6 +201,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38300/4.19/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.19/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.19/0003.patch
@@ -210,5 +212,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0016.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc/^5.13/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.19/0005.patch
 #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch
-editKernelLocalversion "-dos.p210"
+editKernelLocalversion "-dos.p212"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh
index 74f1c22e..d69c8ac0 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh
@@ -179,10 +179,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38300/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch
-editKernelLocalversion "-dos.p184"
+editKernelLocalversion "-dos.p186"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh
index 09f78058..a4826a1f 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh
@@ -70,5 +70,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.4/0007.patch
-editKernelLocalversion "-dos.p70"
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch
+editKernelLocalversion "-dos.p72"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh
index 91e4d387..4adc28ee 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh
@@ -51,5 +51,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1941/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1945/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.4/0007.patch
-editKernelLocalversion "-dos.p51"
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch
+editKernelLocalversion "-dos.p53"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh
index 0c0e4410..a3c2a133 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh
@@ -92,6 +92,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.9/0010.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33098/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.9/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
-editKernelLocalversion "-dos.p93"
+editKernelLocalversion "-dos.p94"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
index d2e51cc0..dd5039f3 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
@@ -242,6 +242,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38300/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.14/0002.patch
@@ -250,5 +252,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch
-editKernelLocalversion "-dos.p250"
+editKernelLocalversion "-dos.p252"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh
index 57fff6c6..8e0cc7ea 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh
@@ -61,6 +61,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.4/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
-editKernelLocalversion "-dos.p62"
+editKernelLocalversion "-dos.p64"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh
index fa590373..6d98edbb 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh
@@ -85,6 +85,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.9/0010.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33098/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.9/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
-editKernelLocalversion "-dos.p86"
+editKernelLocalversion "-dos.p87"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh
index e239f29d..aab9ff1e 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh
@@ -276,6 +276,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38300/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.14/0002.patch
@@ -284,5 +286,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch
-editKernelLocalversion "-dos.p284"
+editKernelLocalversion "-dos.p286"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh
index 0066fc8e..297bc69c 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh
@@ -320,6 +320,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38300/4.19/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.19/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.19/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.19/0003.patch
@@ -334,5 +336,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.19/0011.patch
 #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch
-editKernelLocalversion "-dos.p334"
+editKernelLocalversion "-dos.p336"
 cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh
index 7a5ad5cc..c6be6f6d 100644
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh
@@ -284,10 +284,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch
-editKernelLocalversion "-dos.p289"
+editKernelLocalversion "-dos.p291"
 cd "$DOS_BUILD_BASE"