From ff8dfd95db161640c388fbbc388e7af1784b16c3 Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 26 Oct 2020 05:24:59 -0400 Subject: [PATCH] Small updates --- Manifests/Manifest_LAOS-17.1.xml | 7 + Scripts/LineageOS-15.1/Functions.sh | 1 + Scripts/LineageOS-16.0/Functions.sh | 2 + .../android_kernel_fxtec_msm8998.sh | 290 ++++++++++++++++++ .../CVE_Patchers/android_kernel_google_msm.sh | 6 +- Scripts/LineageOS-17.1/Functions.sh | 8 +- 6 files changed, 308 insertions(+), 6 deletions(-) create mode 100644 Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh diff --git a/Manifests/Manifest_LAOS-17.1.xml b/Manifests/Manifest_LAOS-17.1.xml index ebc40c69..05aecfab 100644 --- a/Manifests/Manifest_LAOS-17.1.xml +++ b/Manifests/Manifest_LAOS-17.1.xml @@ -105,6 +105,10 @@ + + + + @@ -183,6 +187,9 @@ + + + diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 0b5d5eda..13ee5e36 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -109,6 +109,7 @@ patchWorkspace() { source build/envsetup.sh; repopick -i 288970; #update webview + repopick -it tzdb2020d_O; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index cf2f9939..47d0bd2d 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -135,6 +135,8 @@ patchWorkspace() { repopick -it hh-p-sepolicy; repopick -i 232948; #wahoo: liblight: close fd repopick -i 288970; #update webview + repopick -it tzdb2020d_P; + #repopick -it CVE-2019-2306_P; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh new file mode 100644 index 00000000..bef7ba8c --- /dev/null +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh @@ -0,0 +1,290 @@ +#!/bin/bash +cd "$DOS_BUILD_BASE""kernel/fxtec/msm8998" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0154-0155.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0170-0171.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0181-0182.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0183-0184.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0016.patch +git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0020.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0013.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0014.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0015.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0018.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0019.patch +git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9900/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7837/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/^4.6.3/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6187/^4.6.5/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8394/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10905/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10906/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9059/^4.11.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9211/^4.11.2/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/4.4/0019.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13693/^4.12.9/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14875/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18174/^4.7/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18204/^4.14.2/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18509/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000252/^4.13.3/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5953/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7755/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8043/^4.15.8/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10323/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/4.4/0015.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10938/4.0-^4.13/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11506/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12896/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13053/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13094/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13098/^4.17.3/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13099/^4.17.3/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13100/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14609/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14617/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16862/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-17972/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18021/4.4/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18281/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18690/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18710/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-19407/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-19824/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-19985/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20169/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20511/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20836/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20856/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20976/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-21008/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000026/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000026/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0136/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0154/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-0154/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2024/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3701/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3819/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3846/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3882/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3900/4.4/0018.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-6133/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-6974/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-7221/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-7222/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9213/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9245/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9453/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9506/4.4/0016.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9506/4.4/0017.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9506/4.4/0018.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10126/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10142/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10207/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10503/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10639/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11190/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11486/4.4/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11599/^4.9/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11810/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11815/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/4.4/0005.patch +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-12614/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12818/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13272/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13648/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14284/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14615/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14814/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14821/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14835/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14895/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14896/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14901/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15211/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15212/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15213/^5.2.3/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15214/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15215/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15216/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15217/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15218/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15219/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15220/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15221/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15292/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15505/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15666/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15807/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15916/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15927/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16234/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16413/4.4/0005.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16995/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/4.4/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17053/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17054/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17055/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17056/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17075/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17133/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17351/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17666/4.4/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18282/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18680/4.4-^4.4.195/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18683/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18806/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19049/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19052/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19054/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19056/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19057/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19062/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19063/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19066/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19074/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19227/4.4/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.4/0017.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.4/0018.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.4/0019.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.4/0020.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19332/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19447/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19448/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19524/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19525/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19527/4.4/0013.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19527/4.4/0014.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19528/^5.3.7/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19528/^5.3.7/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19530/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19531/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19532/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19533/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19534/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19535/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19536/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19537/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19815/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19947/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19965/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19966/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20810/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/4.4/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-ctnl-addr-leak/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/4.4/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0005.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0006.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0007.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-1749/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.4/0013.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/4.4/0019.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/4.4/0020.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/4.4/0021.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8992/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10711/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10720/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10769/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10773/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10942/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11494/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11609/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11668/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/3.6-^5.10/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12652/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12653/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12654/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12769/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12770/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12771/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12826/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14305/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24490/4.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25211/4.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/4.4/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13096/^4.17.3/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.4/0007.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0004.patch +editKernelLocalversion "-dos.p286" +cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm.sh index 0948b108..6465d1ca 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm.sh @@ -2,7 +2,6 @@ cd "$DOS_BUILD_BASE""kernel/google/msm" git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0009.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0090-Unknown/ANY/0001.patch @@ -148,7 +147,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12233/^4.17.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13053/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13405/3.4/0002.patch @@ -222,7 +220,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.4/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0040/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/ANY/0001.patch @@ -243,5 +241,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-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p243" +editKernelLocalversion "-dos.p241" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 0d8130e8..b496c624 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -18,7 +18,7 @@ #Last verified: 2020-04-14 patchAllKernels() { - startPatcher "kernel_cyanogen_msm8916 kernel_essential_msm8998 kernel_fairphone_msm8974 kernel_google_coral kernel_google_marlin kernel_google_msm kernel_google_msm-4.9 kernel_google_wahoo kernel_google_yellowstone kernel_htc_msm8974 kernel_lge_g3 kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8916 kernel_motorola_msm8974 kernel_motorola_msm8996 kernel_nextbit_msm8992 kernel_oneplus_msm8994 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm8150 kernel_oppo_msm8974 kernel_razer_msm8998 kernel_samsung_jf kernel_samsung_msm8974 kernel_samsung_universal9810 kernel_xiaomi_sdm845 kernel_yandex_sdm660 kernel_zuk_msm8996"; + startPatcher "kernel_cyanogen_msm8916 kernel_essential_msm8998 kernel_fairphone_msm8974 kernel_fxtec_msm8998 kernel_google_coral kernel_google_marlin kernel_google_msm kernel_google_msm-4.9 kernel_google_wahoo kernel_google_yellowstone kernel_htc_msm8974 kernel_lge_g3 kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8916 kernel_motorola_msm8974 kernel_motorola_msm8996 kernel_nextbit_msm8992 kernel_oneplus_msm8994 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm8150 kernel_oppo_msm8974 kernel_razer_msm8998 kernel_samsung_jf kernel_samsung_msm8974 kernel_samsung_universal9810 kernel_xiaomi_sdm845 kernel_yandex_sdm660 kernel_zuk_msm8996"; } export -f patchAllKernels; @@ -56,6 +56,7 @@ buildAll() { if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi; if [ "$DOS_OPTIMIZE_IMAGES" = true ]; then optimizeImagesRecursive "$DOS_BUILD_BASE"; fi; #SDS4P + buildDevice flo; #still in bringup? buildDevice mako; #SD410 buildDevice crackling; @@ -89,7 +90,7 @@ buildAll() { buildDevice sailfish verity; #SD835 buildDevice cheryl; - #buildDevice cheeseburger verity; #broken usb/modem/etc. + #buildDevice cheeseburger verity; #still in bringup, see op8998-ten topic #buildDevice dumpling verity; buildDevice mata verity; buildDevice taimen avb; @@ -100,6 +101,7 @@ buildAll() { buildDevice blueline avb; buildDevice enchilada avb; buildDevice fajita avb; + #buildDevice pro1 avb; #still in bringup, see pro1-ten-bringup topic #SD855 buildDevice guacamole avb; buildDevice guacamoleb avb; @@ -124,6 +126,8 @@ patchWorkspace() { repopick -i 287339; #releasetools: python3 fix repopick -i 288970; #update webview #repopick -it CVE-2019-2306; + repopick -it tzdb2020d_Q; + #repopick -i 290459; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";