From a2d6d77b4c4d68e7f1aed06f8c8c8ab93772c1ef Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 2 Apr 2021 11:58:38 -0400 Subject: [PATCH] Update CVE patchers --- .../CVE_Patchers/android_kernel_fxtec_msm8998.sh | 10 +--------- .../CVE_Patchers/android_kernel_motorola_msm8974.sh | 7 +++---- .../CVE_Patchers/android_kernel_xiaomi_sdm845.sh | 5 +---- .../CVE_Patchers/android_kernel_fxtec_msm8998.sh | 10 +--------- .../CVE_Patchers/android_kernel_samsung_jf.sh | 2 +- .../CVE_Patchers/android_kernel_xiaomi_sdm845.sh | 5 +---- 6 files changed, 8 insertions(+), 31 deletions(-) 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 0255ebd0..d38144a5 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 @@ -28,7 +28,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13693/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14875/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16644/4.4/0004.patch 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 @@ -41,20 +40,13 @@ 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-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-16232/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-19060/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19061/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11160/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-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-20261/4.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28660/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28964/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.4/0004.patch -editKernelLocalversion "-dos.p56" +editKernelLocalversion "-dos.p48" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8974.sh index 023096e9..a55d3b0a 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -63,7 +63,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7308/3.4/0022.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/^4.11.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7645/^4.10.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8246/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8247/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8254/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8254/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8266/3.4/0001.patch @@ -71,7 +70,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8824/^4.14.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9684/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9984/^4.11.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10661/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11000/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11090/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11176/^4.11.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11473/^4.12.2/0001.patch @@ -198,6 +196,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11477/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11478/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11599/^4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch @@ -238,7 +237,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/^5.4.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0040/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch @@ -265,5 +264,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/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/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p265" +editKernelLocalversion "-dos.p264" 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 d2779091..587cb4f5 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 @@ -60,8 +60,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.9/0007.patch 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-28964/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28971/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.9/0005.patch -editKernelLocalversion "-dos.p63" +editKernelLocalversion "-dos.p60" 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 0255ebd0..d38144a5 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 @@ -28,7 +28,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13693/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14875/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16644/4.4/0004.patch 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 @@ -41,20 +40,13 @@ 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-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-16232/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-19060/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19061/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11160/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-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-20261/4.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28660/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28964/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.4/0004.patch -editKernelLocalversion "-dos.p56" +editKernelLocalversion "-dos.p48" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh index e542c792..8a6559ad 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh @@ -21,6 +21,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9410/ANY/msm.git-43b4ff3bf3fbb02e85defcea939629f46506a217.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-0568/ANY/msm.git-8de3fe39e7c40190f82832253ed5946714e5bff1.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-1339/^4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6937/3.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch @@ -141,7 +142,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9568/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/^4.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch 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 d2779091..587cb4f5 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 @@ -60,8 +60,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.9/0007.patch 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-28964/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28971/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.9/0005.patch -editKernelLocalversion "-dos.p63" +editKernelLocalversion "-dos.p60" cd "$DOS_BUILD_BASE"