From f621ff7dda6558360b9821d751651357a3709e43 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 13 Jan 2021 03:42:16 -0500 Subject: [PATCH] Update CVE patchers I have absolutely no idea why kernel_oneplus_msm8998 was downgraded 4.4.241 to 4.4.205 https://github.com/LineageOS/android_kernel_oneplus_msm8998/tree/backup/lineage-17.1_20210108_1948 --- Patches/Linux | 2 +- .../android_kernel_essential_msm8998.sh | 3 +- .../android_kernel_google_wahoo.sh | 3 +- .../android_kernel_oneplus_msm8998.sh | 3 +- .../android_kernel_oneplus_sdm845.sh | 8 +- .../android_kernel_samsung_universal9810.sh | 8 +- .../android_kernel_xiaomi_sdm845.sh | 8 +- .../android_kernel_essential_msm8998.sh | 13 +- .../android_kernel_fxtec_msm8998.sh | 3 +- .../android_kernel_google_bonito.sh | 8 +- .../android_kernel_google_crosshatch.sh | 8 +- .../android_kernel_google_wahoo.sh | 3 +- .../android_kernel_oneplus_msm8998.sh | 3 +- .../android_kernel_oneplus_sdm845.sh | 8 +- .../android_kernel_oneplus_sm8150.sh | 4 +- .../android_kernel_razer_msm8998.sh | 3 +- .../CVE_Patchers/android_kernel_samsung_jf.sh | 3 +- .../android_kernel_xiaomi_sdm845.sh | 8 +- .../android_kernel_yandex_sdm660.sh | 3 +- .../android_kernel_zuk_msm8996.sh | 3 +- .../android_kernel_essential_msm8998.sh | 13 +- .../android_kernel_fxtec_msm8998.sh | 3 +- .../android_kernel_google_coral.sh | 4 +- .../android_kernel_google_msm-4.9.sh | 8 +- .../android_kernel_google_wahoo.sh | 3 +- .../android_kernel_oneplus_msm8998.sh | 126 +++++++++++++++++- .../android_kernel_oneplus_sdm845.sh | 8 +- .../android_kernel_oneplus_sm8150.sh | 4 +- .../android_kernel_razer_msm8998.sh | 3 +- .../CVE_Patchers/android_kernel_samsung_jf.sh | 3 +- .../android_kernel_samsung_universal9810.sh | 8 +- .../android_kernel_xiaomi_sdm845.sh | 8 +- .../android_kernel_yandex_sdm660.sh | 3 +- .../android_kernel_zuk_msm8996.sh | 3 +- Scripts/LineageOS-17.1/Functions.sh | 1 + 35 files changed, 247 insertions(+), 56 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index dc164c26..6b4fdac6 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit dc164c266adc5400946b9e8b706b5a8a1900dfc4 +Subproject commit 6b4fdac60bd32024eeb3190c9de6b2aea263b502 diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_essential_msm8998.sh index eb6165f0..6652455b 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_essential_msm8998.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_essential_msm8998.sh @@ -363,10 +363,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p368" +editKernelLocalversion "-dos.p369" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_wahoo.sh index b885aded..d63b6ea3 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_wahoo.sh @@ -521,10 +521,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p526" +editKernelLocalversion "-dos.p527" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh index 45bde5f2..c8a2e051 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh @@ -449,9 +449,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p453" +editKernelLocalversion "-dos.p454" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh index 55c74a1e..20e4d96f 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh @@ -478,13 +478,19 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29368/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29370/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0031.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0032.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0033.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0034.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0035.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/4.9/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10853/4.9/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.9/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p486" +editKernelLocalversion "-dos.p492" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_universal9810.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_universal9810.sh index ed2946e5..230c2bb6 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_universal9810.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_universal9810.sh @@ -362,11 +362,17 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29368/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29370/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0031.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0032.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0033.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0034.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0035.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.9/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p368" +editKernelLocalversion "-dos.p374" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index ab0ade3f..bab4e014 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -475,13 +475,19 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29368/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29370/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0031.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0032.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0033.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0034.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0035.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/4.9/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10853/4.9/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.9/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p483" +editKernelLocalversion "-dos.p489" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_essential_msm8998.sh index 016676ca..b7dd84b0 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_essential_msm8998.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_essential_msm8998.sh @@ -1,5 +1,7 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/essential/msm8998" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0248-0249.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0249-0250.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 @@ -91,20 +93,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19318/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11239/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.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-27815/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0016.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0017.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0018.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p106" +editKernelLocalversion "-dos.p99" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh index f466f380..2ab23d5a 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh @@ -326,10 +326,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13096/^4.17.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p331" +editKernelLocalversion "-dos.p332" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_bonito.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_bonito.sh index af9c6d4b..fe32aaee 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_bonito.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_bonito.sh @@ -397,11 +397,17 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29368/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29370/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0031.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0032.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0033.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0034.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0035.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.9/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p403" +editKernelLocalversion "-dos.p409" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_crosshatch.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_crosshatch.sh index b9fc6930..eed68e2d 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_crosshatch.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_crosshatch.sh @@ -372,11 +372,17 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29368/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29370/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0031.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0032.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0033.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0034.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0035.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.9/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p378" +editKernelLocalversion "-dos.p384" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_wahoo.sh index 756c7f3f..16fb30b4 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_wahoo.sh @@ -357,9 +357,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p361" +editKernelLocalversion "-dos.p362" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8998.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8998.sh index 6505c2a3..1f2a7216 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8998.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8998.sh @@ -84,7 +84,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13096/^4.17.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p86" +editKernelLocalversion "-dos.p87" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh index 125b8b1d..712f458f 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh @@ -372,12 +372,18 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29368/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29370/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0031.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0032.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0033.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0034.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0035.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14088/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.9/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p379" +editKernelLocalversion "-dos.p385" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh index bacc7ad0..680114b9 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh @@ -384,6 +384,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/4.14/0003.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-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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.14/0009.patch @@ -400,11 +401,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-BleedingToothExtras/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/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-27830/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch -editKernelLocalversion "-dos.p406" +editKernelLocalversion "-dos.p408" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh index 33f0f6a7..a7caad82 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh @@ -263,11 +263,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13096/^4.17.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p269" +editKernelLocalversion "-dos.p270" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_jf.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_jf.sh index e913e6c8..f57361e2 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_jf.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_jf.sh @@ -4,7 +4,6 @@ git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0009.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0090-Unknown/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6544/^3.6/0003.patch @@ -250,5 +249,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch 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/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p250" +editKernelLocalversion "-dos.p249" cd "$DOS_BUILD_BASE" 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 ed66a1d4..8fbcf5cb 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 @@ -226,10 +226,16 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29368/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29370/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0031.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0032.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0033.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0034.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0035.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p231" +editKernelLocalversion "-dos.p237" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_yandex_sdm660.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_yandex_sdm660.sh index 1d47bc77..0475a279 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_yandex_sdm660.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_yandex_sdm660.sh @@ -278,11 +278,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13096/^4.17.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p284" +editKernelLocalversion "-dos.p285" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_zuk_msm8996.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_zuk_msm8996.sh index 9346b5a5..b7bb8cde 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_zuk_msm8996.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_zuk_msm8996.sh @@ -267,10 +267,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p272" +editKernelLocalversion "-dos.p273" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh index 016676ca..b7dd84b0 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh @@ -1,5 +1,7 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/essential/msm8998" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0248-0249.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0249-0250.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 @@ -91,20 +93,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19318/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11239/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.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-27815/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0016.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0017.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0018.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p106" +editKernelLocalversion "-dos.p99" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh index 3a4a2810..cc72c490 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh @@ -1,5 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/fxtec/msm8998" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0249-0250.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 @@ -49,5 +50,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.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 -editKernelLocalversion "-dos.p49" +editKernelLocalversion "-dos.p50" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_coral.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_coral.sh index 8b3ade69..0faef06e 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_coral.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_coral.sh @@ -170,6 +170,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/4.14/0003.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-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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.14/0009.patch @@ -186,10 +187,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-BleedingToothExtras/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.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.p191" +editKernelLocalversion "-dos.p193" 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 4ee62d68..57463bcc 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 @@ -195,10 +195,16 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29368/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29370/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0031.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0032.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0033.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0034.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0035.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p200" +editKernelLocalversion "-dos.p206" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_wahoo.sh index 5d86cc20..a5a3ffe7 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_wahoo.sh @@ -168,7 +168,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p170" +editKernelLocalversion "-dos.p171" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh index c2013977..1e87661e 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh @@ -1,5 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/oneplus/msm8998" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0233-0234.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0242-0243.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 @@ -10,6 +11,7 @@ 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/0013.patch #git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0014.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0015.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0018.patch #git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7837/ANY/0001.patch @@ -33,42 +35,160 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18174/^4.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18204/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000252/^4.13.3/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8043/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16597/4.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10323/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13094/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-21008/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10220/4.4/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10220/4.4/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10494/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12378/^5.1.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12456/^5.1.5/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12614/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14615/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14763/^4.16.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14895/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14896/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14901/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15217/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15220/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15221/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16234/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17351/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19054/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19056/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19057/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19062/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19063/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19066/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19074/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19227/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19318/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.4/0017.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.4/0018.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.4/0019.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.4/0020.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19332/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19447/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19448/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19813/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19816/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19947/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19965/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20810/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/4.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0013.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0014.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/^4.14/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0432/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0444/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0465/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.4/0021.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.4/0022.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.4/0023.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.4/0024.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.4/0025.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-1749/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.4/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3625/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/4.4/0019.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/4.4/0020.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/4.4/0021.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8992/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10135/4.4/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10135/4.4/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10135/4.4/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10711/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10732/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10766/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10942/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11160/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11494/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11609/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11668/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/3.6-^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12652/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12653/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12654/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12769/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12770/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12771/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12826/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14305/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14351/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15436/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15437/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24490/4.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25211/4.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25645/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.4/0028.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.4/0029.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/4.4/0030.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-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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29370/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p70" +editKernelLocalversion "-dos.p190" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh index 2d4da19c..5ee336d3 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh @@ -126,9 +126,15 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.9/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29368/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0031.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0032.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0033.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0034.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0035.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/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-29660/4.9/0005.patch -editKernelLocalversion "-dos.p130" +editKernelLocalversion "-dos.p136" 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 84f0943f..63ccf963 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 @@ -307,6 +307,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/4.14/0003.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-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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.14/0009.patch @@ -323,11 +324,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-BleedingToothExtras/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/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-27830/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch -editKernelLocalversion "-dos.p329" +editKernelLocalversion "-dos.p331" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_razer_msm8998.sh index c81655d9..0bb69adf 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_razer_msm8998.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_razer_msm8998.sh @@ -1,5 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/razer/msm8998" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0249-0250.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 @@ -58,5 +59,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p58" +editKernelLocalversion "-dos.p59" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_jf.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_jf.sh index 8f838cbb..ab8a02f3 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_jf.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_jf.sh @@ -4,7 +4,6 @@ git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0009.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0090-Unknown/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6544/^3.6/0003.patch @@ -249,5 +248,5 @@ git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0004/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch 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/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p249" +editKernelLocalversion "-dos.p248" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_universal9810.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_universal9810.sh index e0b41238..0b146200 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_universal9810.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_universal9810.sh @@ -155,9 +155,15 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.9/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29368/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0031.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0032.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0033.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0034.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0035.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/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-29660/4.9/0005.patch -editKernelLocalversion "-dos.p159" +editKernelLocalversion "-dos.p165" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index e0d2c7ba..b20dfe4e 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -61,5 +61,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.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 -editKernelLocalversion "-dos.p61" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0031.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0032.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0033.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0034.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.9/0035.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.9/0005.patch +editKernelLocalversion "-dos.p67" 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 bc7261c8..d9912b40 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 @@ -183,8 +183,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p186" +editKernelLocalversion "-dos.p187" 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 e8ce85b8..e45d60ca 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 @@ -182,8 +182,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p185" +editKernelLocalversion "-dos.p186" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 3050e4aa..0f5bf36c 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -130,6 +130,7 @@ patchWorkspace() { repopick -i 271361; #releasetools: python3 fix, 287339 (alt) #repopick -it ten-firewall; repopick -it Q_asb_2021-01; + repopick -i 300244 300245 300246 300247 300248 300249 300250 300260 300386 300387; #misc bt asb patches repopick -it 300742; #update webview source "$DOS_SCRIPTS/Patch.sh";