From c0debe55c406e401a981d0fa3f205bfa96198bdf Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 18 Aug 2021 08:23:13 -0400 Subject: [PATCH] Update CVE patchers 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 | 3 ++- .../CVE_Patchers/android_kernel_yandex_sdm660.sh | 3 ++- .../CVE_Patchers/android_kernel_zuk_msm8996.sh | 3 ++- .../CVE_Patchers/android_kernel_essential_msm8998.sh | 3 ++- .../CVE_Patchers/android_kernel_fairphone_sdm632.sh | 3 ++- .../CVE_Patchers/android_kernel_fxtec_msm8998.sh | 5 +++-- .../CVE_Patchers/android_kernel_google_coral.sh | 3 ++- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 3 ++- .../CVE_Patchers/android_kernel_google_redbull.sh | 7 ++++++- .../CVE_Patchers/android_kernel_google_sunfish.sh | 3 ++- .../CVE_Patchers/android_kernel_google_wahoo.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_msm8998.sh | 4 +++- .../CVE_Patchers/android_kernel_oneplus_sdm845.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 3 ++- .../CVE_Patchers/android_kernel_razer_msm8998.sh | 4 +++- .../CVE_Patchers/android_kernel_razer_sdm845.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sdm845.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm8150.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm8250.sh | 6 +++++- 22 files changed, 55 insertions(+), 23 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 461429b9..0ead01d6 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 461429b9ee518c482afda159ec4a7a097911891d +Subproject commit 0ead01d6f62e36615cc6ac469db0e7bc1356942a 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 1d0336bc..bb9ff86c 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 @@ -288,10 +288,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.9/0005.patch 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-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.p293" +editKernelLocalversion "-dos.p294" 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 f2eeeee1..4643142c 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 @@ -324,6 +324,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33033/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33624/4.19/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33624/4.19/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35039/4.19/0002.patch @@ -331,6 +333,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38199/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0003.patch @@ -343,5 +346,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.p343" +editKernelLocalversion "-dos.p346" 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 68de3ae1..411c405d 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 @@ -395,11 +395,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.14/0002.patch +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-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.p401" +editKernelLocalversion "-dos.p402" 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 2eae4ecb..512cf1a2 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 @@ -264,9 +264,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.4/0004.patch 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-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.p268" +editKernelLocalversion "-dos.p269" 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 7ce5f78e..56673c82 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 @@ -269,10 +269,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.4/0004.patch 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-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.p274" +editKernelLocalversion "-dos.p275" 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 3226e0fb..67e8ea4d 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 @@ -97,5 +97,6 @@ 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-2020-24587/qca-wifi-host-cmn/0016.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch -editKernelLocalversion "-dos.p97" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch +editKernelLocalversion "-dos.p98" 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 4d709f61..548ccd43 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 @@ -248,10 +248,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.9/0005.patch 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-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.p253" +editKernelLocalversion "-dos.p254" 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 12be3f58..26b9eca8 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 @@ -2,6 +2,7 @@ cd "$DOS_BUILD_BASE""kernel/fxtec/msm8998" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0276-0277.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0277-0278.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0279-0280.patch --exclude=Makefile 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 @@ -48,7 +49,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-2020-24587/qca-wifi-host-cmn/0016.patch --directory=drivers/staging/qca-wifi-host-cmn -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1955/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch -editKernelLocalversion "-dos.p50" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch +editKernelLocalversion "-dos.p51" 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 d0b4f532..c0681c27 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 @@ -141,8 +141,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p144" +editKernelLocalversion "-dos.p145" 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 93a6f3a2..be7101d5 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 @@ -149,8 +149,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.9/0005.patch 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-2020-24586/4.9/0009.patch -editKernelLocalversion "-dos.p152" +editKernelLocalversion "-dos.p153" 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 3599dc8f..0e92dd0d 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 @@ -143,13 +143,18 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33200/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33200/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33200/4.19/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33624/4.19/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33624/4.19/0013.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33624/4.19/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35039/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38198/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38199/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0003.patch @@ -158,5 +163,5 @@ 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-2020-29660/4.19/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch -editKernelLocalversion "-dos.p158" +editKernelLocalversion "-dos.p163" 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 feeaebf4..8f277d31 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 @@ -142,8 +142,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p145" +editKernelLocalversion "-dos.p146" 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 8b3df5c3..a59339ac 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 @@ -196,7 +196,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.4/0004.patch 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-2020-24586/4.4/0007.patch -editKernelLocalversion "-dos.p198" +editKernelLocalversion "-dos.p199" 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 dc35c6f2..9a61393a 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 @@ -2,6 +2,7 @@ cd "$DOS_BUILD_BASE""kernel/oneplus/msm8998" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0276-0277.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0277-0278.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0279-0280.patch --exclude=Makefile 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 @@ -51,5 +52,6 @@ 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-1945/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch -editKernelLocalversion "-dos.p51" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.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 4d174c36..e21e9462 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 @@ -208,9 +208,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.9/0005.patch 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-2020-24586/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p212" +editKernelLocalversion "-dos.p213" 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 3c98097e..75988b75 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 @@ -196,11 +196,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/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.p202" +editKernelLocalversion "-dos.p203" 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 20a5de30..c8dc103c 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 @@ -2,6 +2,7 @@ cd "$DOS_BUILD_BASE""kernel/razer/msm8998" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0276-0277.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0277-0278.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0279-0280.patch --exclude=Makefile 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 @@ -50,5 +51,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24587/qca-wifi-host-cmn/0016.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1955/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch -editKernelLocalversion "-dos.p50" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch +editKernelLocalversion "-dos.p52" 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 c6cfa2d1..02e1882b 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 @@ -3,6 +3,7 @@ cd "$DOS_BUILD_BASE""kernel/razer/sdm845" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0276-0277.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0277-0278.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0278-0279.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0279-0280.patch --exclude=Makefile 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 @@ -67,5 +68,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch -editKernelLocalversion "-dos.p67" +editKernelLocalversion "-dos.p68" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index e8f83d4d..86dd46ae 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -3,6 +3,7 @@ cd "$DOS_BUILD_BASE""kernel/xiaomi/sdm845" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0276-0277.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0277-0278.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0278-0279.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0279-0280.patch --exclude=Makefile 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 @@ -67,5 +68,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch -editKernelLocalversion "-dos.p67" +editKernelLocalversion "-dos.p68" 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 d9045673..b756c5b6 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 @@ -227,11 +227,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/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.p233" +editKernelLocalversion "-dos.p234" 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 b5d06207..283db95a 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 @@ -252,13 +252,17 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33033/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33624/4.19/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33624/4.19/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35039/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38198/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38199/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0003.patch @@ -270,5 +274,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.p270" +editKernelLocalversion "-dos.p274" cd "$DOS_BUILD_BASE"