From 1bd7aab80556a1a64b1e06625e1712a74f0dfb09 Mon Sep 17 00:00:00 2001 From: Tad Date: Thu, 7 Dec 2017 20:19:46 -0500 Subject: [PATCH] Update CVE patchers --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_amazon_hdx-common.sh | 1 + .../CVE_Patchers/android_kernel_fairphone_msm8974.sh | 1 + .../CVE_Patchers/android_kernel_google_marlin.sh | 2 +- .../LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh | 5 +++-- .../CVE_Patchers/android_kernel_htc_msm8994.sh | 2 +- .../CVE_Patchers/android_kernel_lge_hammerhead.sh | 1 + .../CVE_Patchers/android_kernel_motorola_msm8992.sh | 2 ++ .../CVE_Patchers/android_kernel_oneplus_msm8974.sh | 1 + 9 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 693a4f41..7996bfa9 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 693a4f41a0a6e4d1536ec6c2d6476b762065ed54 +Subproject commit 7996bfa9e4e78e4631d98d78435243113a0f69cc diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh index 541946ad..3db0652a 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh @@ -71,6 +71,7 @@ git apply $cvePatches/CVE-2017-6348/^4.9/0001.patch git apply $cvePatches/CVE-2017-6951/^3.14/0001.patch git apply $cvePatches/CVE-2017-7308/ANY/0003.patch git apply $cvePatches/CVE-2017-7487/ANY/0001.patch +git apply $cvePatches/CVE-2017-7533/3.4/0001.patch git apply $cvePatches/CVE-2017-8246/3.4/0002.patch git apply $cvePatches/CVE-2017-8247/ANY/0001.patch git apply $cvePatches/CVE-2017-8254/3.4/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh index 44d3c736..91aae5bd 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh @@ -23,5 +23,6 @@ git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch git apply $cvePatches/CVE-2017-16USB/ANY/0005.patch git apply $cvePatches/CVE-2017-16USB/ANY/0006.patch git apply $cvePatches/CVE-2017-6348/^4.9/0001.patch +git apply $cvePatches/CVE-2017-7533/3.4/0001.patch git apply $cvePatches/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh index 8c12d0d7..a13dfa54 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -18,7 +18,7 @@ git apply $cvePatches/0002-Copperhead-Kernel_Hardening/3.18/0034.patch git apply $cvePatches/0002-Copperhead-Kernel_Hardening/3.18/0035.patch git apply $cvePatches/0002-Copperhead-Kernel_Hardening/3.18/0036.patch git apply $cvePatches/0002-Copperhead-Kernel_Hardening/3.18/0037.patch -git apply $cvePatches/0002-Copperhead-Kernel_Hardening/3.18/0038.patch +#git apply $cvePatches/0002-Copperhead-Kernel_Hardening/3.18/0038.patch git apply $cvePatches/0002-Copperhead-Kernel_Hardening/3.18/0039.patch git apply $cvePatches/0002-Copperhead-Kernel_Hardening/3.18/0040.patch git apply $cvePatches/0002-Copperhead-Kernel_Hardening/3.18/0041.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh index c0f71608..9eb83f69 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh @@ -14,8 +14,8 @@ git apply $cvePatches/CVE-2017-0710/ANY/0001.patch git apply $cvePatches/CVE-2017-0750/ANY/0001.patch git apply $cvePatches/CVE-2017-0751/ANY/0001.patch git apply $cvePatches/CVE-2017-0786/ANY/0001.patch -git apply $cvePatches/CVE-2017-11015/prima/0001.patch -git apply $cvePatches/CVE-2017-11015/prima/0002.patch +#git apply $cvePatches/CVE-2017-11015/prima/0001.patch +#git apply $cvePatches/CVE-2017-11015/prima/0002.patch git apply $cvePatches/CVE-2017-11089/ANY/0001.patch git apply $cvePatches/CVE-2017-11090/ANY/0001.patch git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch @@ -34,6 +34,7 @@ git apply $cvePatches/CVE-2017-16650/ANY/0001.patch git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch git apply $cvePatches/CVE-2017-16USB/ANY/0005.patch git apply $cvePatches/CVE-2017-16USB/ANY/0006.patch +git apply $cvePatches/CVE-2017-7533/3.4/0001.patch git apply $cvePatches/CVE-2017-8246/3.4/0002.patch git apply $cvePatches/CVE-2017-8254/3.4/0001.patch git apply $cvePatches/CVE-2017-8254/3.4/0002.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh index 80cbd485..f9c3ba47 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh @@ -59,7 +59,7 @@ git apply $cvePatches/CVE-2016-6672/ANY/0001.patch git apply $cvePatches/CVE-2016-6693/ANY/0001.patch git apply $cvePatches/CVE-2016-6696/ANY/0001.patch git apply $cvePatches/CVE-2016-6738/ANY/0001.patch -git apply $cvePatches/CVE-2016-6741/3.10/0001.patch +#git apply $cvePatches/CVE-2016-6741/3.10/0001.patch git apply $cvePatches/CVE-2016-6751/ANY/0001.patch git apply $cvePatches/CVE-2016-6753/ANY/0001.patch git apply $cvePatches/CVE-2016-7097/3.10/0002.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh index 587786ff..d76e1e38 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh @@ -29,6 +29,7 @@ git apply $cvePatches/CVE-2017-2671/^4.10/0001.patch git apply $cvePatches/CVE-2017-6345/^4.9/0001.patch git apply $cvePatches/CVE-2017-6348/^4.9/0001.patch git apply $cvePatches/CVE-2017-6951/^3.14/0001.patch +git apply $cvePatches/CVE-2017-7533/3.4/0001.patch git apply $cvePatches/CVE-2017-8246/3.4/0002.patch git apply $cvePatches/CVE-2017-8247/ANY/0001.patch git apply $cvePatches/CVE-2017-8254/3.4/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 fdeecfb3..a2836926 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 @@ -31,6 +31,7 @@ git apply $cvePatches/CVE-2016-10232/3.10/0001.patch git apply $cvePatches/CVE-2016-2063/ANY/0001.patch git apply $cvePatches/CVE-2016-3070/ANY/0001.patch git apply $cvePatches/CVE-2016-3857/ANY/0001.patch +git apply $cvePatches/CVE-2016-3860/ANY/0001.patch git apply $cvePatches/CVE-2016-3865/ANY/0001.patch git apply $cvePatches/CVE-2016-3865/ANY/0002.patch git apply $cvePatches/CVE-2016-3867/3.10/0001.patch @@ -91,6 +92,7 @@ git apply $cvePatches/CVE-2017-11014/qcacld-2.0/0001.patch git apply $cvePatches/CVE-2017-11019/ANY/0001.patch git apply $cvePatches/CVE-2017-11024/ANY/0001.patch git apply $cvePatches/CVE-2017-11033/3.10/0001.patch +git apply $cvePatches/CVE-2017-11046/ANY/0001.patch git apply $cvePatches/CVE-2017-11056/ANY/0001.patch git apply $cvePatches/CVE-2017-11059/ANY/0001.patch git apply $cvePatches/CVE-2017-11085/3.10/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh index 1016ffc6..59a4d868 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh @@ -34,6 +34,7 @@ git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch git apply $cvePatches/CVE-2017-16USB/ANY/0005.patch git apply $cvePatches/CVE-2017-16USB/ANY/0006.patch git apply $cvePatches/CVE-2017-7487/ANY/0001.patch +git apply $cvePatches/CVE-2017-7533/3.4/0001.patch git apply $cvePatches/CVE-2017-8246/3.4/0002.patch git apply $cvePatches/CVE-2017-8247/ANY/0001.patch git apply $cvePatches/CVE-2017-9242/^4.11/0001.patch