From 5797ea8fc41da4ba1039efdebe61bfe9c5afb58a Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 2 Jun 2020 17:33:27 -0400 Subject: [PATCH] Small fixes CVE-2019-14047/ANY/0002.patch will probably need to be disabled on more devices --- Patches/Linux | 2 +- Scripts/Common/Fix_CVE_Patchers.sh | 2 +- .../CVE_Patchers/android_kernel_motorola_msm8992.sh | 3 ++- Scripts/LineageOS-14.1/Functions.sh | 1 + .../CVE_Patchers/android_kernel_essential_msm8998.sh | 4 ++-- .../CVE_Patchers/android_kernel_samsung_universal9810.sh | 2 +- .../CVE_Patchers/android_kernel_essential_msm8998.sh | 2 +- .../CVE_Patchers/android_kernel_google_bonito.sh | 2 +- .../CVE_Patchers/android_kernel_google_crosshatch.sh | 2 +- 9 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index fef06f48..dcbf3465 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit fef06f48009cef331def4c694fa478c96e0e138c +Subproject commit dcbf3465dbd96f5a700d185ab2fa3c9aadf412d2 diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index f08e6d18..63ee713b 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -33,7 +33,7 @@ commentPatches android_kernel_asus_grouper.sh "CVE-2017-15868/3.4/0002.patch" "C commentPatches android_kernel_asus_msm8916.sh "CVE-2018-13913/ANY/0001.patch"; commentPatches android_kernel_asus_msm8953.sh "CVE-2017-13162/3.18/0001.patch"; commentPatches android_kernel_cyanogen_msm8916.sh "CVE-2018-13913/ANY/0001.patch"; -commentPatches android_kernel_essential_msm8998.sh "CVE-2017-13218/4.4/0026.patch"; +commentPatches android_kernel_essential_msm8998.sh "CVE-2017-13218/4.4/0026.patch" "CVE-2019-14047/ANY/0002.patch"; commentPatches android_kernel_google_bonito.sh "CVE-2020-0067/ANY/0001.patch"; commentPatches android_kernel_google_dragon.sh "CVE-2015-4167/^3.19.1/0001.patch"; commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067/ANY/0001.patch"; diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh index 3ed22248..24ce603e 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh @@ -91,6 +91,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0404/^3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0427/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0452/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0454/3.10/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0457/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0457/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0460/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0516/ANY/0001.patch @@ -355,5 +356,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8281/3.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch -editKernelLocalversion "-dos.p355" +editKernelLocalversion "-dos.p356" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 1c756a39..fa7f297f 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -122,6 +122,7 @@ patchWorkspace() { repopick -it tzdb2020a_N; repopick -it n-asb-2020-05; repopick -i 275225; #update webview + repopick -it n-asb-2020-06; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails 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 55033189..ca6620c3 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 @@ -55,7 +55,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5896/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5898/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5898/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5905/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5906/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5908/4.4/0003.patch @@ -122,7 +122,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/^5.2.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14038/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14047/ANY/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14047/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14049/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14055/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/^5.2.8/0001.patch 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 a60feb7f..41af6f14 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 @@ -66,7 +66,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3846/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-6974/^4.20.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-7222/^4.20.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9466/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9503/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10142/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11810/^5.0.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/^5.1.2/0001.patch 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 a5888fdc..8b55c2b5 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 @@ -85,7 +85,7 @@ 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-14040/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14047/ANY/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14047/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19054/^5.3.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/^5.3.11/0001.patch 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 3da841fb..997e5d73 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 @@ -86,7 +86,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9447/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9448/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9451/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9466/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9503/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10142/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10486/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10494/ANY/0001.patch 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 7384b3de..35acec02 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 @@ -82,7 +82,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9447/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9448/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9451/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9466/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9503/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10142/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10486/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10494/ANY/0001.patch