From 4f9299f9009cdcbdd7ee041a97d2328f969c9e64 Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 30 Mar 2018 21:47:33 -0400 Subject: [PATCH] Update CVE patchers --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_google_marlin.sh | 6 +++++- .../CVE_Patchers/android_kernel_lge_msm8996.sh | 3 ++- .../CVE_Patchers/android_kernel_motorola_msm8992.sh | 3 ++- .../CVE_Patchers/android_kernel_samsung_universal8890.sh | 3 ++- Scripts/LineageOS-14.1/Functions.sh | 2 +- .../CVE_Patchers/android_kernel_google_marlin.sh | 5 ++++- 7 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 13228338..820e80f1 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 13228338b4be36c7b0a4f6e251a6f75b704993c1 +Subproject commit 820e80f1bfb909a9e936ad745c2c40c7b07f7fa4 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 627bb6a4..b6b95c33 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 @@ -111,6 +111,7 @@ git apply $cvePatchesLinux/CVE-2017-11030/3.18/0002.patch git apply $cvePatchesLinux/CVE-2017-11031/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-11032/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11033/3.18/0003.patch +git apply $cvePatchesLinux/CVE-2017-11034/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11044/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-11045/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11046/ANY/0001.patch @@ -143,6 +144,7 @@ git apply $cvePatchesLinux/CVE-2017-15649/ANY/0002.patch git apply $cvePatchesLinux/CVE-2017-15834/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15847/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15850/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-15858/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.18/0003.patch git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch @@ -165,6 +167,7 @@ git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0009.patch git apply $cvePatchesLinux/CVE-2017-17558/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-17762/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-17769/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-18150/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-2671/^4.10/0001.patch git apply $cvePatchesLinux/CVE-2017-5669/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-5972/ANY/0002.patch @@ -193,6 +196,7 @@ git apply $cvePatchesLinux/CVE-2017-9696/3.18/0002.patch git apply $cvePatchesLinux/CVE-2017-9697/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-9698/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-9700/3.18/0001.patch +git apply $cvePatchesLinux/CVE-2017-9707/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-9716/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-9719/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-9720/3.18/0002.patch @@ -209,5 +213,5 @@ git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15845/ANY/0001.patch -editKernelLocalversion "-dos.p209" +editKernelLocalversion "-dos.p213" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh index 0fc788ef..91fc51c2 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -80,6 +80,7 @@ git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15649/ANY/0002.patch git apply $cvePatchesLinux/CVE-2017-15834/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15850/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-15858/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.18/0003.patch git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch @@ -125,5 +126,5 @@ git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p125" +editKernelLocalversion "-dos.p126" cd $base 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 cc19594b..b16802b1 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 @@ -180,6 +180,7 @@ git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch git apply $cvePatchesLinux/CVE-2017-9075/^4.11/0001.patch git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch git apply $cvePatchesLinux/CVE-2017-9696/3.10/0001.patch +git apply $cvePatchesLinux/CVE-2017-9699/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-9702/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-9703/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-9703/3.10/0002.patch @@ -195,5 +196,5 @@ git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15845/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch -editKernelLocalversion "-dos.p195" +editKernelLocalversion "-dos.p196" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh index 1c56d1cf..b9ab5dc3 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh @@ -94,6 +94,7 @@ git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13218/3.18/0011.patch git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-15858/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.18/0003.patch git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch @@ -142,5 +143,5 @@ git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3- #git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0039.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch -editKernelLocalversion "-dos.p142" +editKernelLocalversion "-dos.p143" cd $base diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 07963cc1..004de139 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -191,7 +191,7 @@ export -f enableForcedEncryption; enableStrongEncryption() { cd $base$1; if [ -f BoardConfig.mk ]; then - if [ $1 != "device/oneplus/bacon" ] && [ $1 != "device/motorola/clark" ] && [ $1 != "device/lge/d852" ]; then #These test devices currently have encryption enabled, don't break them + if [ $1 != "device/oneplus/bacon" ] && [ $1 != "device/lge/d852" ]; then #These test devices currently have encryption enabled, don't break them echo "TARGET_WANTS_STRONG_ENCRYPTION := true" >> BoardConfig.mk; echo "Enabled AES-256 encryption for $1"; fi; diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh index a1befe93..d8001ea0 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -70,6 +70,7 @@ git apply $cvePatchesLinux/CVE-2017-0622/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-0627/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0866/3.18/0001.patch +git apply $cvePatchesLinux/CVE-2017-11034/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-14883/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15649/ANY/0002.patch git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch @@ -89,11 +90,13 @@ git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0005.patch git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0006.patch git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0009.patch git apply $cvePatchesLinux/CVE-2017-17558/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-18150/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-5669/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-5972/ANY/0002.patch git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-7371/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-7372/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-9707/ANY/0001.patch git apply $cvePatchesLinux/Untracked/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch git apply $cvePatchesLinux/Untracked/ANY/0005-tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch git apply $cvePatchesLinux/CVE-2016-5853/3.18/0002.patch @@ -102,5 +105,5 @@ git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-14883/ANY/0001.patch -editKernelLocalversion "-dos.p102" +editKernelLocalversion "-dos.p105" cd $base