From 62166d1ea500f5a3ac38328e508978f6be745b8d Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 26 Nov 2021 11:47:38 -0500 Subject: [PATCH] Update CVE patchers Signed-off-by: Tad --- .gitignore | 1 + Patches/Linux | 2 +- PrebuiltApps | 2 +- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm7250.sh | 6 +++++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm6150.sh | 3 ++- Scripts/LineageOS-17.1/Functions.sh | 1 - .../CVE_Patchers/android_kernel_essential_msm8998.sh | 3 +-- .../CVE_Patchers/android_kernel_fairphone_sdm632.sh | 3 ++- .../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 | 6 +++++- .../CVE_Patchers/android_kernel_google_sunfish.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_msm8998.sh | 5 +---- .../CVE_Patchers/android_kernel_oneplus_sdm845.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 3 ++- .../CVE_Patchers/android_kernel_razer_sdm845.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sdm845.sh | 7 +------ .../CVE_Patchers/android_kernel_xiaomi_sm8150.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm8250.sh | 6 +++++- Scripts/LineageOS-18.1/Functions.sh | 1 - 22 files changed, 43 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 71c08c64..07238851 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ Untracked/ .Trash-1000 pending_commit.txt dos.duperemove +Checklists diff --git a/Patches/Linux b/Patches/Linux index 0fc3ea52..8e1e86f2 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 0fc3ea528ee7dbd8f44b569cc6636c4ece4fa440 +Subproject commit 8e1e86f28e2b8a3dfaf4feed122dd208614f3eb1 diff --git a/PrebuiltApps b/PrebuiltApps index 88e8f727..cba67c00 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 88e8f72710ce3b3c3f9f12c048e6546fd839ca91 +Subproject commit cba67c00ef5e7e63388608b68436f0340fd65947 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 5d4ff0fa..b58a0029 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 @@ -269,6 +269,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0013.patch @@ -328,5 +329,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p328" +editKernelLocalversion "-dos.p329" 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 30e82d9a..2b45c70a 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 @@ -305,6 +305,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3635/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0009.patch @@ -379,6 +382,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43975/^5.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0003.patch 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 @@ -389,5 +393,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.p389" +editKernelLocalversion "-dos.p393" 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 10ecc7b1..426ae1b7 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 @@ -374,6 +374,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3656/4.14/0004.patch @@ -434,5 +435,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.p434" +editKernelLocalversion "-dos.p435" 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 64458c1e..6ba9bf6e 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 @@ -117,6 +117,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0006.patch @@ -181,5 +182,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p181" +editKernelLocalversion "-dos.p182" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index fdb7f633..39061d5a 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -99,7 +99,6 @@ patchWorkspace() { #source build/envsetup.sh; #repopick -it ten-firewall; - #repopick -it Q_tzdb2021a1; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; 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 efb9f335..225c90e3 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh @@ -1,6 +1,5 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/essential/msm8998" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0291-0292.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/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0004.patch @@ -100,5 +99,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch -editKernelLocalversion "-dos.p100" +editKernelLocalversion "-dos.p99" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh index cc086e54..8e07167d 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 @@ -230,6 +230,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0013.patch @@ -296,5 +297,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.p296" +editKernelLocalversion "-dos.p297" 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 e0b5815b..57257d8a 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 @@ -115,6 +115,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0006.patch @@ -178,5 +179,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p178" +editKernelLocalversion "-dos.p179" 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 750ea87f..45f880a4 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 @@ -129,6 +129,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0013.patch @@ -185,5 +186,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch -editKernelLocalversion "-dos.p185" +editKernelLocalversion "-dos.p186" 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 6cf78f68..3a54e8db 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 @@ -107,6 +107,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0008.patch @@ -190,10 +193,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38300/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43975/^5.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0003.patch 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.p195" +editKernelLocalversion "-dos.p199" 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 bb3c5646..4a33e525 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 @@ -112,6 +112,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0006.patch @@ -175,5 +176,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p175" +editKernelLocalversion "-dos.p176" 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 b114052b..e38b5a1c 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 @@ -1,8 +1,5 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/oneplus/msm8998" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0289-0290.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0290-0291.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0291-0292.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 @@ -53,5 +50,5 @@ 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-1941/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1945/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn -editKernelLocalversion "-dos.p53" +editKernelLocalversion "-dos.p50" 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 f0cb6dc5..5d7e2096 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 @@ -77,6 +77,7 @@ 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-0929/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0014.patch @@ -90,5 +91,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch -editKernelLocalversion "-dos.p90" +editKernelLocalversion "-dos.p91" 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 af313fa8..f29fb536 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 @@ -175,6 +175,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0006.patch @@ -243,5 +244,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.p243" +editKernelLocalversion "-dos.p244" 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 3dfa65d0..fc979fb3 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 @@ -72,6 +72,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/4.9/0007.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-3640/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0015.patch @@ -83,5 +84,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch -editKernelLocalversion "-dos.p83" +editKernelLocalversion "-dos.p84" 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 7c2f36ce..3795159b 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 @@ -1,6 +1,5 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/xiaomi/sdm845" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0289-0290.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 @@ -65,9 +64,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-3640/^5.14/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3772/4.9/0015.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3772/4.9/0016.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.9/0005.patch -editKernelLocalversion "-dos.p69" +editKernelLocalversion "-dos.p64" 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 2b2ab344..f79aed93 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 @@ -209,6 +209,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0006.patch @@ -277,5 +278,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.p277" +editKernelLocalversion "-dos.p278" 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 026ac766..2d774758 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 @@ -234,6 +234,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0008.patch @@ -312,6 +315,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43975/^5.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0003.patch 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 @@ -321,5 +325,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.p321" +editKernelLocalversion "-dos.p325" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index 40f4592d..eb03f87e 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -132,7 +132,6 @@ patchWorkspace() { #source build/envsetup.sh; #repopick -it eleven-firewall; - #repopick -it R_tzdb2021a1; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";