From d7287a6b94a7e1c5d4ae5f861e1e9d9accb7580a Mon Sep 17 00:00:00 2001 From: Tad Date: Sun, 27 Jun 2021 11:26:56 -0400 Subject: [PATCH] Update CVE patchers --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm7250.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 3 ++- .../CVE_Patchers/android_kernel_yandex_sdm660.sh | 3 ++- .../LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh | 3 ++- .../LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 3 ++- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 39dd1fee..5d0eb088 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 39dd1fee1d5523eec706314a70d9f26c57a55341 +Subproject commit 5d0eb0888e08cc56d5204d133980225e09fc00b9 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 d6f0a848..8991bd51 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 @@ -243,6 +243,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27777/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27786/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28097/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28374/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.19/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.19/0011.patch @@ -321,5 +322,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-3587/4.19/0003.patch -editKernelLocalversion "-dos.p321" +editKernelLocalversion "-dos.p322" 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 0e0c8f46..82dc7ed0 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 @@ -317,6 +317,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27171/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27777/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28097/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28374/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.14/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.14/0008.patch @@ -384,5 +385,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.p384" +editKernelLocalversion "-dos.p385" 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 380145d7..d0bfc69d 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 @@ -188,6 +188,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28097/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.4/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.4/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.4/0015.patch @@ -254,5 +255,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.p254" +editKernelLocalversion "-dos.p255" 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 e1cc6a66..be354acb 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 @@ -187,6 +187,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28097/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.4/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.4/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.4/0015.patch @@ -253,5 +254,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.p253" +editKernelLocalversion "-dos.p254" 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 89761c98..58e0add7 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 @@ -137,6 +137,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26147/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26558/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28097/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.4/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.4/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.4/0015.patch @@ -187,5 +188,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.4/0007.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.p187" +editKernelLocalversion "-dos.p188" 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 a364b3c6..a0d6d9ef 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 @@ -113,6 +113,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27171/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27777/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28097/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28374/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.14/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.14/0008.patch @@ -181,5 +182,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.p181" +editKernelLocalversion "-dos.p182" cd "$DOS_BUILD_BASE"