From 28de039beb5532b6a9d365b1c5e7abdb901d355e Mon Sep 17 00:00:00 2001 From: Tad Date: Sun, 22 Apr 2018 02:41:18 -0400 Subject: [PATCH] Update CVE patchers --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_asus_msm8916.sh | 5 +++-- .../CVE_Patchers/android_kernel_htc_msm8994.sh | 5 +++-- .../CVE_Patchers/android_kernel_lge_msm8992.sh | 5 +++-- .../CVE_Patchers/android_kernel_lge_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_motorola_msm8916.sh | 5 +++-- .../CVE_Patchers/android_kernel_motorola_msm8992.sh | 5 +++-- .../CVE_Patchers/android_kernel_nextbit_msm8992.sh | 5 +++-- .../CVE_Patchers/android_kernel_samsung_jf.sh | 3 ++- .../CVE_Patchers/android_kernel_samsung_smdk4412.sh | 3 ++- .../CVE_Patchers/android_kernel_google_marlin.sh | 2 +- .../CVE_Patchers/android_kernel_htc_flounder.sh | 5 ++++- .../LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh | 6 +----- .../CVE_Patchers/android_kernel_lge_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_motorola_msm8992.sh | 5 +++-- .../CVE_Patchers/android_kernel_nextbit_msm8992.sh | 5 +++-- Scripts/LineageOS-15.1/Rebrand.sh | 3 +++ 17 files changed, 40 insertions(+), 28 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index e64e3829..1c9bc188 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit e64e3829469c51e1e5cbf2cfd34fb1e772ec63a2 +Subproject commit 1c9bc188934f6db85124f82ed232f7f4c6c460dc diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh index 0a0a89cd..7656b1b5 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_msm8916.sh @@ -44,6 +44,7 @@ git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16531/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16533/^4.13/0001.patch +git apply $cvePatchesLinux/CVE-2017-16534/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16535/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16538/^4.13/0001.patch @@ -62,10 +63,10 @@ git apply $cvePatchesLinux/CVE-2017-7533/3.10/0003.patch git apply $cvePatchesLinux/CVE-2017-8281/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch git apply $cvePatchesLinux/CVE-2017-9723/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2018-3563/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch git apply $cvePatchesLinux/LVT-2017-0003/3.10/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-0750/ANY/0001.patch -editKernelLocalversion "-dos.p67" +editKernelLocalversion "-dos.p68" cd $base 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 12849a56..6508be58 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 @@ -75,6 +75,7 @@ git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16531/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16533/^4.13/0001.patch +git apply $cvePatchesLinux/CVE-2017-16534/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16535/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16538/^4.13/0001.patch @@ -103,7 +104,7 @@ git apply $cvePatchesLinux/CVE-2017-8281/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch git apply $cvePatchesLinux/CVE-2017-9723/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2018-3563/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch git apply $cvePatchesLinux/CVE-2018-5825/3.10/0001.patch git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch @@ -111,5 +112,5 @@ git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch -editKernelLocalversion "-dos.p111" +editKernelLocalversion "-dos.p112" cd $base 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 ab5a1ff4..498f185e 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 @@ -108,6 +108,7 @@ git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16531/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16533/^4.13/0001.patch +git apply $cvePatchesLinux/CVE-2017-16534/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16535/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16538/^4.13/0001.patch @@ -158,7 +159,7 @@ git apply $cvePatchesLinux/CVE-2017-9708/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-9720/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-9724/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-9725/3.10/0001.patch -git apply $cvePatchesLinux/CVE-2018-3563/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch git apply $cvePatchesLinux/CVE-2018-5825/3.10/0001.patch git apply $cvePatchesLinux/LVT-2017-0001/3.10/0003.patch git apply $cvePatchesLinux/LVT-2017-0002/3.10/0002.patch @@ -169,5 +170,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.p169" +editKernelLocalversion "-dos.p170" 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 c626262c..da6ff6bc 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 @@ -115,7 +115,7 @@ git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-7533/3.18/0004.patch git apply $cvePatchesLinux/CVE-2017-7616/^4.10/0001.patch git apply $cvePatchesLinux/CVE-2017-7618/^4.10/0002.patch -git apply $cvePatchesLinux/CVE-2018-3563/ANY/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/Untracked/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh index 11574709..eca33967 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh @@ -56,6 +56,7 @@ git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15845/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-16534/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16538/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16538/^4.13/0002.patch @@ -71,11 +72,11 @@ git apply $cvePatchesLinux/CVE-2017-6345/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-7533/3.10/0003.patch git apply $cvePatchesLinux/CVE-2017-7541/3.10/0002.patch -git apply $cvePatchesLinux/CVE-2018-3563/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch 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 git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p77" +editKernelLocalversion "-dos.p78" 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 9ca19f2c..a0c02a26 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 @@ -129,6 +129,7 @@ git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16531/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16533/^4.13/0001.patch +git apply $cvePatchesLinux/CVE-2017-16534/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16535/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16538/^4.13/0001.patch @@ -189,7 +190,7 @@ git apply $cvePatchesLinux/CVE-2017-9708/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-9720/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-9724/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-9725/3.10/0001.patch -git apply $cvePatchesLinux/CVE-2018-3563/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch 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 @@ -198,5 +199,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.p198" +editKernelLocalversion "-dos.p199" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh index f32af321..aac08170 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh @@ -40,6 +40,7 @@ git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16531/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16533/^4.13/0001.patch +git apply $cvePatchesLinux/CVE-2017-16534/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16535/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16538/^4.13/0001.patch @@ -60,11 +61,11 @@ git apply $cvePatchesLinux/CVE-2017-8243/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-8281/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch git apply $cvePatchesLinux/CVE-2017-9723/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2018-3563/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch git apply $cvePatchesLinux/CVE-2018-5825/3.10/0001.patch git apply $cvePatchesLinux/LVT-2017-0003/3.10/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-0750/ANY/0001.patch -editKernelLocalversion "-dos.p66" +editKernelLocalversion "-dos.p67" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh index 61e15739..1f5c1900 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh @@ -36,6 +36,7 @@ git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-13292/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch @@ -55,5 +56,5 @@ git apply $cvePatchesLinux/CVE-2017-8254/3.4/0002.patch git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch git apply $cvePatchesLinux/CVE-2016-2475/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p55" +editKernelLocalversion "-dos.p56" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh index 442bf8fe..62182c7a 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh @@ -29,6 +29,7 @@ git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-13292/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch @@ -47,5 +48,5 @@ git apply $cvePatchesLinux/CVE-2017-7308/ANY/0003.patch git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch git apply $cvePatchesLinux/CVE-2014-9781/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch -editKernelLocalversion "-dos.p47" +editKernelLocalversion "-dos.p48" 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 718045a5..982a5d11 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 @@ -97,7 +97,7 @@ 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/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2018-3563/3.18/0002.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 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 0904bd87..cf465a92 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 @@ -40,10 +40,13 @@ git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13216/3.10/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-13273/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-13292/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0002.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-16534/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16538/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16538/^4.13/0002.patch @@ -67,5 +70,5 @@ git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch 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-2475/ANY/0001.patch -editKernelLocalversion "-dos.p67" +editKernelLocalversion "-dos.p70" cd $base diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh index f1198aa9..e3220c6f 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh @@ -7,18 +7,14 @@ git apply $cvePatchesLinux/CVE-2016-7910/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11473/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 -git apply $cvePatchesLinux/CVE-2017-16533/^4.13/0001.patch -git apply $cvePatchesLinux/CVE-2017-16535/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16650/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0005.patch git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0006.patch -git apply $cvePatchesLinux/CVE-2017-17558/ANY/0001.patch git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p20" +editKernelLocalversion "-dos.p16" 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 7f840e70..192bb71c 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 @@ -62,7 +62,7 @@ git apply $cvePatchesLinux/CVE-2017-5972/ANY/0002.patch git apply $cvePatchesLinux/CVE-2017-6001/^4.9/0002.patch git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2018-3560/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2018-3563/ANY/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/LVT-2017-0001/3.18/0004.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8992.sh index ffb16a47..a7f91d42 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8992.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8992.sh @@ -42,6 +42,7 @@ git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16531/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16533/^4.13/0001.patch +git apply $cvePatchesLinux/CVE-2017-16534/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16535/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16538/^4.13/0001.patch @@ -62,11 +63,11 @@ git apply $cvePatchesLinux/CVE-2017-8243/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-8281/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch git apply $cvePatchesLinux/CVE-2017-9723/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2018-3563/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch git apply $cvePatchesLinux/CVE-2018-5825/3.10/0001.patch git apply $cvePatchesLinux/LVT-2017-0003/3.10/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-0750/ANY/0001.patch -editKernelLocalversion "-dos.p68" +editKernelLocalversion "-dos.p69" cd $base diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh index f32af321..aac08170 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh @@ -40,6 +40,7 @@ git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16531/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16533/^4.13/0001.patch +git apply $cvePatchesLinux/CVE-2017-16534/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16535/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16537/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16538/^4.13/0001.patch @@ -60,11 +61,11 @@ git apply $cvePatchesLinux/CVE-2017-8243/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-8281/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch git apply $cvePatchesLinux/CVE-2017-9723/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2018-3563/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch git apply $cvePatchesLinux/CVE-2018-5825/3.10/0001.patch git apply $cvePatchesLinux/LVT-2017-0003/3.10/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-0750/ANY/0001.patch -editKernelLocalversion "-dos.p66" +editKernelLocalversion "-dos.p67" cd $base diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh index 2d8ca0d9..3e97bbd1 100644 --- a/Scripts/LineageOS-15.1/Rebrand.sh +++ b/Scripts/LineageOS-15.1/Rebrand.sh @@ -33,6 +33,9 @@ sed -i '/.*lineage_version/s/LineageOS/DivestOS/' lineage/res/res/values*/string sed -i '/.*lineage_updates/s/LineageOS/DivestOS/' lineage/res/res/values*/strings.xml; sed -i '/.*lineageos_system_label/s/LineageOS/DivestOS/' lineage/res/res/values*/strings.xml; +enter "packages/apps/LineageParts" +sed -i '/.*trust_feature_security_patches_explain/s/LineageOS/DivestOS/' res/values*/strings.xml; + enter "packages/apps/Settings" sed -i '/.*lineagelicense_title/s/LineageOS/DivestOS/' res/values*/cm_strings.xml;