Update CVE patchers

Signed-off-by: Tad <tad@spotco.us>
2024-06-26 14:42:13 +00:00 · 2022-04-04 14:58:50 -04:00 · 2022-04-04 14:58:50 -04:00 · b464106cc5
commit b464106cc5
parent deb183d273
38 changed files with 211 additions and 142 deletions
--- a/Patches/Linux
+++ b/Patches/Linux
@ -1 +1 @@
-Subproject commit c10319a662a03d97e21f36bdea6fe5bec01fe3e6
+Subproject commit 3b3dda9494c45f24226fc1a0b4626e359f88ce15
--- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh
+++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh
@ -687,10 +687,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.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
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh
@ -647,9 +647,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.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
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh
@ -541,16 +541,17 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch
-editKernelLocalversion "-dos.p552"
+editKernelLocalversion "-dos.p553"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh
+++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh
@ -630,10 +630,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
 #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0004.patch
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh
@ -399,17 +399,18 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch
-editKernelLocalversion "-dos.p411"
+editKernelLocalversion "-dos.p412"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh
+++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh
@ -399,17 +399,18 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch
-editKernelLocalversion "-dos.p411"
+editKernelLocalversion "-dos.p412"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-16.0/Patch.sh
+++ b/Scripts/LineageOS-16.0/Patch.sh
@ -94,7 +94,6 @@ git revert --no-edit 58544f3aa139b4603fa26c39e8d9259402d658b8; #Re-enable the do
 git revert --no-edit 271f6ffa045064abcac066e97f2cb53ccb3e5126 61f7ee9386be426fd4eadc2c8759362edb5bef8; #Add back PicoTTS and language files
 applyPatch "$DOS_PATCHES/android_build/0001-OTA_Keys.patch"; #Add correct keys to recovery for OTA verification
 applyPatch "$DOS_PATCHES/android_build/0002-Enable_fwrapv.patch"; #Use -fwrapv at a minimum (GrapheneOS)
-#if [ "$DOS_GRAPHENE_EXEC" = true ]; then sed -i 's/enforce_rro_enabled := true/enforce_rro_enabled :=/g' core/package_internal.mk; fi;
 sed -i '74i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches.
 if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk target/product/treble_common.mk; fi; #Replace the Messaging app with Silence
 sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 17/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS)
--- 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
@ -384,9 +384,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.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
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.9/0007.patch
-editKernelLocalversion "-dos.p388"
+editKernelLocalversion "-dos.p389"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh
@ -549,16 +549,17 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15815/qcacld-2.0/0002.patch --directory=drivers/staging/qcacld-2.0
 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
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch
-editKernelLocalversion "-dos.p560"
+editKernelLocalversion "-dos.p561"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh
@ -441,6 +441,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.19/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.19/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.19/0005.patch
@ -448,5 +449,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.p448"
+editKernelLocalversion "-dos.p449"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
@ -478,10 +478,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.14/0005.patch
 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.p483"
+editKernelLocalversion "-dos.p484"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
@ -240,6 +240,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.14/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch
-editKernelLocalversion "-dos.p241"
+editKernelLocalversion "-dos.p243"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh
@ -313,23 +313,25 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0435/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/4.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.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
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch
-editKernelLocalversion "-dos.p331"
+editKernelLocalversion "-dos.p333"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-17.1/Patch.sh
+++ b/Scripts/LineageOS-17.1/Patch.sh
@ -92,7 +92,6 @@ git revert --no-edit 0a9df01b268a238a623f5e0ea5221cebdfee2414; #Re-enable the do
 applyPatch "$DOS_PATCHES/android_build/0001-Restore_TTS.patch"; #Add back PicoTTS and language files
 applyPatch "$DOS_PATCHES/android_build/0002-OTA_Keys.patch"; #Add correct keys to recovery for OTA verification
 applyPatch "$DOS_PATCHES/android_build/0003-Enable_fwrapv.patch"; #Use -fwrapv at a minimum (GrapheneOS)
-#if [ "$DOS_GRAPHENE_EXEC" = true ]; then sed -i 's/enforce_rro_enabled := true/enforce_rro_enabled :=/g' core/package_internal.mk; fi;
 sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches.
 if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk target/product/gsi_common.mk; fi; #Replace the Messaging app with Silence
 awk -i inplace '!/updatable_apex.mk/' target/product/mainline_system.mk; #Disable APEX
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh
@ -97,19 +97,24 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0435/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26490/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
-editKernelLocalversion "-dos.p111"
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch
+editKernelLocalversion "-dos.p116"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh
@ -350,9 +350,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.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
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.9/0007.patch
-editKernelLocalversion "-dos.p354"
+editKernelLocalversion "-dos.p355"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh
@ -45,18 +45,23 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0435/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
-editKernelLocalversion "-dos.p58"
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch
+editKernelLocalversion "-dos.p63"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh
@ -238,6 +238,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.14/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch
-editKernelLocalversion "-dos.p239"
+editKernelLocalversion "-dos.p241"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_marlin.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_marlin.sh
@ -443,12 +443,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.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/0005-tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5853/3.18/0002.patch
@ -457,5 +458,5 @@ 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
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch
-editKernelLocalversion "-dos.p457"
+editKernelLocalversion "-dos.p458"
 cd "$DOS_BUILD_BASE"
--- 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
@ -239,7 +239,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.9/0007.patch
-editKernelLocalversion "-dos.p241"
+editKernelLocalversion "-dos.p243"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh
@ -261,7 +261,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.19/0005.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.p263"
+editKernelLocalversion "-dos.p265"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh
@ -234,6 +234,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.14/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch
-editKernelLocalversion "-dos.p235"
+editKernelLocalversion "-dos.p237"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh
@ -66,18 +66,23 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.9/0004.patch
 #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0435/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
-editKernelLocalversion "-dos.p79"
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch
+editKernelLocalversion "-dos.p84"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh
@ -528,16 +528,17 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch
-editKernelLocalversion "-dos.p539"
+editKernelLocalversion "-dos.p540"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh
@ -445,16 +445,17 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/3.18/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch
-editKernelLocalversion "-dos.p456"
+editKernelLocalversion "-dos.p457"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh
@ -50,18 +50,23 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39792/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0435/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
-editKernelLocalversion "-dos.p63"
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch
+editKernelLocalversion "-dos.p68"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh
@ -112,6 +112,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.9/0010.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0644/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0847/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1195/4.9/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1195/4.9/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch
@ -128,5 +130,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
-editKernelLocalversion "-dos.p128"
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch
+editKernelLocalversion "-dos.p132"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh
@ -240,6 +240,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30265/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30265/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30316/ANY/0001.patch
 #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30334/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.14/0002.patch
@ -296,9 +297,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.14/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.14/0006.patch
 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.p300"
+editKernelLocalversion "-dos.p303"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh
@ -44,18 +44,23 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0435/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
-editKernelLocalversion "-dos.p57"
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch
+editKernelLocalversion "-dos.p62"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh
@ -77,6 +77,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.9/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.9/0010.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0847/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23036/4.9/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23036/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch
@ -96,5 +98,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
-editKernelLocalversion "-dos.p96"
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch
+editKernelLocalversion "-dos.p100"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm660.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm660.sh
@ -302,23 +302,25 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc/4.4/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0435/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/4.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.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
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch
-editKernelLocalversion "-dos.p320"
+editKernelLocalversion "-dos.p322"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm845.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm845.sh
@ -302,8 +302,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.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
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.9/0007.patch
-editKernelLocalversion "-dos.p305"
+editKernelLocalversion "-dos.p306"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh
@ -44,18 +44,23 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/4.9/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0435/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1199/4.9/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
-editKernelLocalversion "-dos.p57"
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-GPZ2253/4.9/0007.patch
+editKernelLocalversion "-dos.p62"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh
@ -278,6 +278,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30265/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30265/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30316/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30334/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.14/0002.patch
@ -333,9 +334,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.14/0002.patch
 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.p337"
+editKernelLocalversion "-dos.p339"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh
@ -379,11 +379,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.19/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.19/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.19/0005.patch
 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.p385"
+editKernelLocalversion "-dos.p386"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh
@ -303,24 +303,26 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44879/^5.16/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0435/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0487/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/4.4/0005.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.9/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28356/4.9/0004.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
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch
-editKernelLocalversion "-dos.p322"
+editKernelLocalversion "-dos.p324"
 cd "$DOS_BUILD_BASE"
--- a/Scripts/LineageOS-18.1/Patch.sh
+++ b/Scripts/LineageOS-18.1/Patch.sh
@ -90,7 +90,6 @@ git revert --no-edit def3f14af17ae92192d2cc7d22349cabfa906fd6; #Re-enable the do
 applyPatch "$DOS_PATCHES/android_build/0001-Enable_fwrapv.patch"; #Use -fwrapv at a minimum (GrapheneOS)
 applyPatch "$DOS_PATCHES/android_build/0002-OTA_Keys.patch"; #Add correct keys to recovery for OTA verification
 if [ "$DOS_GRAPHENE_EXEC" = true ]; then applyPatch "$DOS_PATCHES/android_build/0003-Exec_Based_Spawning.patch"; fi; #Add exec-based spawning support (GrapheneOS) #XXX: most devices override this
-#if [ "$DOS_GRAPHENE_EXEC" = true ]; then sed -i 's/enforce_rro_enabled := true/enforce_rro_enabled :=/g' core/package_internal.mk; fi; #XXX: insane?
 sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches.
 if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk target/product/aosp_product.mk; fi; #Replace the Messaging app with Silence
 awk -i inplace '!/updatable_apex.mk/' target/product/mainline_system.mk; #Disable APEX