From f5fd480f5665e5d76e9c9b7fdc971a21981c6914 Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 7 May 2018 16:20:58 -0400 Subject: [PATCH] Update CVE patchers --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_lge_msm8992.sh | 4 +++- .../CVE_Patchers/android_kernel_lge_msm8996.sh | 6 +++++- .../CVE_Patchers/android_kernel_motorola_msm8992.sh | 3 ++- .../CVE_Patchers/android_kernel_google_marlin.sh | 7 ++++--- .../CVE_Patchers/android_kernel_huawei_angler.sh | 3 ++- .../CVE_Patchers/android_kernel_lge_bullhead.sh | 3 ++- .../CVE_Patchers/android_kernel_lge_msm8996.sh | 6 +++++- 8 files changed, 24 insertions(+), 10 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index a934569f..3df11056 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit a934569fde426cfc4653c635f4bfa1f04c50f214 +Subproject commit 3df110564933e4485c77420247c4f7a218a60c47 diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh index 629f1211..18efbcd1 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh @@ -101,6 +101,8 @@ git apply $cvePatchesLinux/CVE-2017-14897/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch git apply $cvePatchesLinux/CVE-2017-15833/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15834/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-15842/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-15843/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15850/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0002.patch @@ -171,5 +173,5 @@ git apply $cvePatchesLinux/CVE-2016-6696/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.p171" +editKernelLocalversion "-dos.p173" 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 9b6ce373..06828859 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 @@ -79,6 +79,8 @@ git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15115/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-15842/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-15843/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 @@ -119,6 +121,8 @@ git apply $cvePatchesLinux/CVE-2017-7618/^4.10/0002.patch git apply $cvePatchesLinux/CVE-2018-3563/3.18/0002.patch git apply $cvePatchesLinux/CVE-2018-3599/ANY/0001.patch git apply $cvePatchesLinux/CVE-2018-5825/3.18/0002.patch +git apply $cvePatchesLinux/CVE-2018-5848/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2018-5849/ANY/0001.patch git apply $cvePatchesLinux/Untracked/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch git apply $cvePatchesLinux/Untracked/ANY/0003-tunnels-Don-t-apply-GRO-to-multiple-layers-of-encaps.patch git apply $cvePatchesLinux/Untracked/ANY/0004-net-add-recursion-limit-to-GRO.patch @@ -129,5 +133,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.p129" +editKernelLocalversion "-dos.p133" 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 39cfa187..01295bcd 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 @@ -122,6 +122,7 @@ git apply $cvePatchesLinux/CVE-2017-14877/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch git apply $cvePatchesLinux/CVE-2017-15833/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15834/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-15843/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15850/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0002.patch @@ -200,5 +201,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.p200" +editKernelLocalversion "-dos.p201" cd $base 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 27cc1c1a..0dda11fc 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 @@ -72,6 +72,7 @@ git apply $cvePatchesLinux/CVE-2017-11034/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-14883/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15115/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15649/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2017-15842/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch @@ -88,7 +89,6 @@ git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0003.patch 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-17449/ANY/0001.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 @@ -97,7 +97,8 @@ 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/CVE-2018-3563/3.18/0002.patch +git apply $cvePatchesLinux/CVE-2018-5848/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2018-5849/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 @@ -106,5 +107,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.p106" +editKernelLocalversion "-dos.p107" cd $base diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh index a493bf0b..2f7a3e75 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh @@ -75,6 +75,7 @@ git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11600/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatchesLinux/CVE-2017-14877/3.10/0001.patch +git apply $cvePatchesLinux/CVE-2017-15842/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch @@ -108,5 +109,5 @@ git apply $cvePatchesLinux/CVE-2016-2475/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15845/ANY/0001.patch -editKernelLocalversion "-dos.p108" +editKernelLocalversion "-dos.p109" cd $base diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh index 6e4698a0..45f76e37 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh @@ -68,6 +68,7 @@ git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11600/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatchesLinux/CVE-2017-14877/3.10/0001.patch +git apply $cvePatchesLinux/CVE-2017-15842/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch @@ -97,5 +98,5 @@ git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch -editKernelLocalversion "-dos.p97" +editKernelLocalversion "-dos.p98" cd $base diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh index 20c92d61..c896efa9 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -52,6 +52,8 @@ git apply $cvePatchesLinux/CVE-2017-11045/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13162/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-13245/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-15842/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-15843/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15846/ANY/0002.patch git apply $cvePatchesLinux/CVE-2017-16650/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0005.patch @@ -66,11 +68,13 @@ git apply $cvePatchesLinux/CVE-2018-3560/ANY/0001.patch git apply $cvePatchesLinux/CVE-2018-3563/3.18/0002.patch git apply $cvePatchesLinux/CVE-2018-3599/ANY/0001.patch git apply $cvePatchesLinux/CVE-2018-5825/3.18/0002.patch +git apply $cvePatchesLinux/CVE-2018-5848/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2018-5849/ANY/0001.patch git apply $cvePatchesLinux/LVT-2017-0001/3.18/0004.patch git apply $cvePatchesLinux/LVT-2017-0002/3.18/0003.patch 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.p72" +editKernelLocalversion "-dos.p76" cd $base