From 2db8ac7c704a4a0591760e6ba928204e79f74019 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 4 Aug 2021 14:22:42 -0400 Subject: [PATCH] Update CVE patchers Signed-off-by: Tad --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_xiaomi_sdm845.sh | 4 +++- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 4 +++- .../CVE_Patchers/android_kernel_oneplus_sm7250.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 3 ++- .../CVE_Patchers/android_kernel_yandex_sdm660.sh | 4 +++- .../LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh | 4 +++- .../CVE_Patchers/android_kernel_essential_msm8998.sh | 2 +- .../CVE_Patchers/android_kernel_fairphone_sdm632.sh | 4 +++- .../CVE_Patchers/android_kernel_fxtec_msm8998.sh | 3 ++- .../CVE_Patchers/android_kernel_google_coral.sh | 3 ++- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 4 +++- .../CVE_Patchers/android_kernel_google_wahoo.sh | 4 +++- .../CVE_Patchers/android_kernel_oneplus_msm8998.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sdm845.sh | 4 +++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 3 ++- .../CVE_Patchers/android_kernel_razer_msm8998.sh | 3 ++- .../CVE_Patchers/android_kernel_razer_sdm845.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sdm845.sh | 3 ++- 19 files changed, 44 insertions(+), 19 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 1d4b0baa..f527078f 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 1d4b0baaa74f38b99c41cad0bbb83e50c7a1762c +Subproject commit f527078fb1ff757c8d2c6b9d4fdf99e534c69cb9 diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index 0850efa2..b2d62f64 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -286,6 +286,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.9/0005.patch @@ -320,5 +322,5 @@ 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-3587/4.9/0005.patch -editKernelLocalversion "-dos.p320" +editKernelLocalversion "-dos.p322" cd "$DOS_BUILD_BASE" 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 eee855ab..18083161 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 @@ -255,6 +255,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.9/0005.patch @@ -291,5 +293,5 @@ 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-3587/4.9/0005.patch -editKernelLocalversion "-dos.p291" +editKernelLocalversion "-dos.p293" 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 06038087..70c9d8f3 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 @@ -288,6 +288,7 @@ 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-3655/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/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-21781/4.14-^5.11/0001.patch @@ -338,5 +339,5 @@ 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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3587/4.19/0003.patch -editKernelLocalversion "-dos.p338" +editKernelLocalversion "-dos.p339" 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 680cc5e1..f8b949f1 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 @@ -360,6 +360,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch @@ -397,5 +398,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.p397" +editKernelLocalversion "-dos.p398" 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 9fa8353a..dc08a74b 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 @@ -232,7 +232,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.4/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/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-21781/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.4/0004.patch @@ -266,5 +268,5 @@ 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-3587/4.4/0004.patch -editKernelLocalversion "-dos.p266" +editKernelLocalversion "-dos.p268" 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 af88bfc1..2eb2ad8e 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 @@ -237,7 +237,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.4/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/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-21781/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.4/0004.patch @@ -272,5 +274,5 @@ 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-3587/4.4/0004.patch -editKernelLocalversion "-dos.p272" +editKernelLocalversion "-dos.p274" 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 e0292435..5a10e6b2 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,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/essential/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/0007-Accelerated_AES/3.10+/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0020.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.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 82a59d36..e3f29339 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 @@ -215,6 +215,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.9/0005.patch @@ -251,5 +253,5 @@ 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-3587/4.9/0005.patch -editKernelLocalversion "-dos.p251" +editKernelLocalversion "-dos.p253" 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 d65bc156..d7f5fd21 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 @@ -1,6 +1,7 @@ #!/bin/bash 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/0007-Accelerated_AES/3.10+/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0020.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch @@ -51,5 +52,5 @@ 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.p51" +editKernelLocalversion "-dos.p52" 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 86742d96..5ac1f91f 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 @@ -103,6 +103,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch @@ -141,5 +142,5 @@ 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-2020-24586/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3587/4.14/0002.patch -editKernelLocalversion "-dos.p141" +editKernelLocalversion "-dos.p142" 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 2e48437e..baef6ef3 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 @@ -117,6 +117,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.9/0005.patch @@ -151,5 +153,5 @@ 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-2020-24586/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3587/4.9/0005.patch -editKernelLocalversion "-dos.p151" +editKernelLocalversion "-dos.p153" 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 470b11a3..782be1de 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 @@ -165,7 +165,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.4/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/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-21781/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.4/0004.patch @@ -197,5 +199,5 @@ 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-2020-24586/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3587/4.4/0004.patch -editKernelLocalversion "-dos.p197" +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 61e11a58..a5289aab 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,6 +1,7 @@ #!/bin/bash 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/0007-Accelerated_AES/3.10+/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0020.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch @@ -52,5 +53,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-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.p52" +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 92f86ae5..cac483c6 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 @@ -175,6 +175,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.9/0005.patch @@ -210,5 +212,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.9/0005.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-3587/4.9/0005.patch -editKernelLocalversion "-dos.p210" +editKernelLocalversion "-dos.p212" 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 38f2f907..32526a87 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 @@ -158,6 +158,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch @@ -199,5 +200,5 @@ 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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3587/4.14/0002.patch -editKernelLocalversion "-dos.p199" +editKernelLocalversion "-dos.p200" 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 8a3a3d9c..641a97f8 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 @@ -1,6 +1,7 @@ #!/bin/bash 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/0007-Accelerated_AES/3.10+/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0020.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch @@ -51,5 +52,5 @@ 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.p51" +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 aa09fd9e..5e1d0c3a 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 @@ -1,6 +1,7 @@ #!/bin/bash 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/0007-Accelerated_AES/3.10+/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0020.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0025.patch @@ -68,5 +69,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.p68" +editKernelLocalversion "-dos.p69" 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 45614591..d84e74bf 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,7 @@ #!/bin/bash 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/0007-Accelerated_AES/3.10+/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0020.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0025.patch @@ -68,5 +69,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.p68" +editKernelLocalversion "-dos.p69" cd "$DOS_BUILD_BASE"