From dbd2a717228b04660c2b0ece6cdf86f0f0f0d2e9 Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 17 Jan 2022 00:24:54 -0500 Subject: [PATCH] Update CVE patchers Hopefully fixes boot breakage Signed-off-by: Tad --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm7250.sh | 5 ++--- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 4 +--- .../CVE_Patchers/android_kernel_xiaomi_sm6150.sh | 5 ++--- .../CVE_Patchers/android_kernel_yandex_sdm660.sh | 2 +- .../CVE_Patchers/android_kernel_zuk_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_fairphone_sdm632.sh | 3 ++- .../CVE_Patchers/android_kernel_google_coral.sh | 5 ++--- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 3 ++- .../CVE_Patchers/android_kernel_google_redbull.sh | 5 ++--- .../CVE_Patchers/android_kernel_google_sunfish.sh | 5 ++--- .../LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sdm845.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 5 ++--- .../CVE_Patchers/android_kernel_sony_sdm660.sh | 2 +- .../CVE_Patchers/android_kernel_sony_sdm845.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm8150.sh | 5 ++--- .../CVE_Patchers/android_kernel_xiaomi_sm8250.sh | 5 ++--- .../CVE_Patchers/android_kernel_zuk_msm8996.sh | 2 +- 20 files changed, 34 insertions(+), 38 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 18570f69..410e0dd3 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 18570f69ddee6bbdd2a39790524aac80fd83df3b +Subproject commit 410e0dd3873b265897e3ba5422bad849109828bc 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 d465d07e..3fc6556d 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 @@ -2,6 +2,7 @@ cd "$DOS_BUILD_BASE""kernel/google/msm-4.9" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0242-0243.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0286-0287.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0025.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0026.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0027.patch @@ -353,5 +354,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.9/0005.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.p353" +editKernelLocalversion "-dos.p354" 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 87194e11..177be609 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 @@ -4,6 +4,7 @@ git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0082-0083.pat git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0137-0138.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0144-0145.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0156-0157.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.19/0012.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.19/0087.patch @@ -286,7 +287,6 @@ 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-0937/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0938/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch @@ -332,7 +332,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4155/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.19/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4203/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20177/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.19/0004.patch @@ -421,5 +420,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.p421" +editKernelLocalversion "-dos.p420" 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 d12347f3..3e9c5f5a 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 @@ -358,7 +358,6 @@ 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-0937/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0941/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch @@ -395,7 +394,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.14/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4203/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch @@ -457,5 +455,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.p457" +editKernelLocalversion "-dos.p455" 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 953c31f6..e788df63 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 @@ -4,6 +4,7 @@ git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0213-0214.pat git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0216-0217.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0219-0220.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0261-0262.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.14/0011.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0057.patch @@ -92,7 +93,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1927/ANY/0001.patch @@ -140,7 +140,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.14/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4203/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch @@ -205,5 +204,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p205" +editKernelLocalversion "-dos.p204" 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 d34c8a0a..3850ab15 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 @@ -6,6 +6,7 @@ git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0242-0243.patch git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0251-0252.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0288-0289.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0298-0299.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0011.patch @@ -257,7 +258,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4203/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.4/0007.patch 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 e895b238..9400b3b8 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 @@ -6,6 +6,7 @@ git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0242-0243.patch git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0251-0252.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0288-0289.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0298-0299.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0011.patch @@ -263,7 +264,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4203/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.4/0007.patch 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 5116f9cb..611b68fe 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 @@ -3,6 +3,7 @@ cd "$DOS_BUILD_BASE""kernel/fairphone/sdm632" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0239-0240.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0242-0243.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0286-0287.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/0005-Graphene-Deny_USB/4.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0025.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0026.patch @@ -320,5 +321,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.p320" +editKernelLocalversion "-dos.p321" 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 c81996c1..ba3f55c7 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 @@ -3,6 +3,7 @@ cd "$DOS_BUILD_BASE""kernel/google/coral" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0216-0217.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0219-0220.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0261-0262.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.14/0011.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0057.patch @@ -102,7 +103,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch @@ -138,7 +138,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.14/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4203/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch @@ -202,5 +201,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p202" +editKernelLocalversion "-dos.p201" 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 65afe873..6be19f0c 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 @@ -2,6 +2,7 @@ cd "$DOS_BUILD_BASE""kernel/google/msm-4.9" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0252-0253.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0286-0287.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0024.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0025.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0026.patch @@ -205,5 +206,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch -editKernelLocalversion "-dos.p205" +editKernelLocalversion "-dos.p206" 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 14e8bab0..c2ee5113 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 @@ -3,6 +3,7 @@ cd "$DOS_BUILD_BASE""kernel/google/redbull" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0181-0182.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0185-0186.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0215-0216.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.19/0012.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.19/0087.patch @@ -96,7 +97,6 @@ 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-0937/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0938/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.19/0003.patch @@ -134,7 +134,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4155/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.19/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4203/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20177/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch @@ -228,5 +227,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.p228" +editKernelLocalversion "-dos.p227" 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 4d6abde0..5f52f308 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 @@ -3,6 +3,7 @@ cd "$DOS_BUILD_BASE""kernel/google/sunfish" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0216-0217.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0219-0220.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0261-0262.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.14/0011.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0057.patch @@ -99,7 +100,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-BleedingToothExtras/^5.10/0001.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-0937/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch @@ -135,7 +135,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.14/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4203/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch @@ -199,5 +198,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p199" +editKernelLocalversion "-dos.p198" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh index 516091a7..e143ff69 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh @@ -1,5 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/moto/shamu" +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.10/0004-No_dir-relax.patch @@ -269,5 +270,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p269" +editKernelLocalversion "-dos.p270" 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 5d4bfce4..9b48b476 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 @@ -2,6 +2,7 @@ cd "$DOS_BUILD_BASE""kernel/oneplus/sdm845" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0286-0287.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0289-0290.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/0005-Graphene-Deny_USB/4.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0024.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0025.patch @@ -96,5 +97,5 @@ 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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.9/0005.patch -editKernelLocalversion "-dos.p96" +editKernelLocalversion "-dos.p97" 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 645e64e8..f34e59e9 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 @@ -6,6 +6,7 @@ git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0207-0208.pat git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0210-0211.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0219-0220.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0261-0262.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.14/0011.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0057.patch @@ -152,7 +153,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch @@ -195,7 +195,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.14/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4203/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch @@ -265,5 +264,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.p265" +editKernelLocalversion "-dos.p264" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm660.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm660.sh index 1f61f67f..19bea460 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm660.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm660.sh @@ -5,6 +5,7 @@ git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0242-0243.patch git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0251-0252.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0288-0289.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0298-0299.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0011.patch @@ -245,7 +246,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4203/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.4/0007.patch diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm845.sh index 55b70a22..81a2898e 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm845.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm845.sh @@ -2,6 +2,7 @@ cd "$DOS_BUILD_BASE""kernel/sony/sdm845" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0242-0243.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0286-0287.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0025.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0026.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0027.patch @@ -369,5 +370,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.9/0005.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.p369" +editKernelLocalversion "-dos.p370" 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 0d3b523d..ca3c7cab 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 @@ -5,6 +5,7 @@ git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0201-0202.pat git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0205-0206.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0219-0220.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0261-0262.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.14/0011.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0057.patch @@ -180,7 +181,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch @@ -230,7 +230,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.14/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4203/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch @@ -299,5 +298,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.p299" +editKernelLocalversion "-dos.p298" 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 dac5c080..5e53bd21 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 @@ -5,6 +5,7 @@ git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0144-0145.pat git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0151-0152.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0156-0157.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.19/4.19.0168-0169.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.19/0012.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.19/0087.patch @@ -210,7 +211,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0938/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.11-^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch @@ -260,7 +260,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4155/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.19/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4203/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20177/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.19/0004.patch @@ -352,5 +351,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.p352" +editKernelLocalversion "-dos.p351" 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 d7009e1e..fef4b84d 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 @@ -5,6 +5,7 @@ git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0242-0243.patch git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0251-0252.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0288-0289.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0298-0299.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/4.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0011.patch @@ -251,7 +252,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4203/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.4/0007.patch