From 9e897989d1eece46b94897b74e78cf86e61652a8 Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 4 Mar 2019 20:18:29 -0500 Subject: [PATCH] Update CVE patchers --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_asus_fugu.sh | 2 +- .../CVE_Patchers/android_kernel_huawei_angler.sh | 2 +- .../CVE_Patchers/android_kernel_lge_bullhead.sh | 2 +- .../CVE_Patchers/android_kernel_asus_fugu.sh | 10 ++-------- .../CVE_Patchers/android_kernel_essential_msm8998.sh | 3 ++- .../CVE_Patchers/android_kernel_google_dragon.sh | 2 +- .../CVE_Patchers/android_kernel_htc_flounder.sh | 2 +- .../CVE_Patchers/android_kernel_huawei_angler.sh | 2 +- .../CVE_Patchers/android_kernel_lge_bullhead.sh | 2 +- .../CVE_Patchers/android_kernel_moto_shamu.sh | 3 +-- .../android_kernel_samsung_universal9810.sh | 4 +++- 12 files changed, 16 insertions(+), 20 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index e7199e57..42e94c11 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit e7199e57b2c6ff780a56b07d90d959c320d22c0f +Subproject commit 42e94c116104bb207731f5cc10863a379e28cbd8 diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh index 6cd415da..d808205b 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh @@ -152,7 +152,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10881/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14634/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.10/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh index 02be0900..2914ec46 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh @@ -173,7 +173,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10881/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11273/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11286/ANY/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh index fb7f5867..3a1e2a36 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh @@ -169,7 +169,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10881/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11273/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11286/ANY/0001.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh index 4a3d9aa5..de57eb36 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh @@ -62,15 +62,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0449/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0537/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0564/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0648/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0824/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0861/3.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0862/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000251/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000365/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000410/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11089/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11090/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11473/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11600/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12153/3.2-^3.16/0001.patch @@ -123,7 +118,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7472/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7533/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7533/3.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7541/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9242/^4.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/ANY/0001.patch @@ -133,7 +127,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10881/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14634/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.10/0001.patch @@ -152,5 +146,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0008-nfsd-check-for-oversized git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.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-2016-2475/ANY/0001.patch -editKernelLocalversion "-dos.p152" +editKernelLocalversion "-dos.p146" cd "$DOS_BUILD_BASE" 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 412bf862..a05ace2f 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 @@ -24,6 +24,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12010/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13912/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13913/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13914/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13917/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3597/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5831/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5857/4.4/0002.patch @@ -44,5 +45,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14875/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11274/ANY/0001.patch -editKernelLocalversion "-dos.p44" +editKernelLocalversion "-dos.p45" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh index 587e1e50..31d9f4f9 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh @@ -114,7 +114,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9698/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10881/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3575/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5390/3.18/0003.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh index 0575b92b..4599c936 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh @@ -81,7 +81,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10881/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14634/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3584/ANY/0001.patch 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 feaf1b52..7bf2abb6 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 @@ -111,7 +111,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10881/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11286/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch 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 b8d662e8..c3d37be3 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 @@ -103,7 +103,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10881/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11286/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh index 3890b715..f378ad4f 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh @@ -1,6 +1,5 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/moto/shamu" -git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0004-No_dir-relax.patch git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0007.patch git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0008.patch @@ -66,5 +65,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-9f34c6ebc016cd061ae5ec901221d15fa3d67e49.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p66" +editKernelLocalversion "-dos.p65" cd "$DOS_BUILD_BASE" 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 343a4fff..ff5e3a06 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 @@ -11,11 +11,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11036/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13917/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3575/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5848/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9416/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2024/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p17" +editKernelLocalversion "-dos.p19" cd "$DOS_BUILD_BASE"