diff --git a/Patches/Linux b/Patches/Linux index 7ff07d97..13228338 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 7ff07d977fe5ab6b789c63eb5cb1e1865b5b82d0 +Subproject commit 13228338b4be36c7b0a4f6e251a6f75b704993c1 diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh index 6f1a31cf..8d09f513 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh @@ -85,5 +85,6 @@ git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch git apply $cvePatchesLinux/CVE-2017-9684/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-9706/ANY/0001.patch git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch -editKernelLocalversion "-dos.p85" +git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch +editKernelLocalversion "-dos.p86" cd $base 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 0d75b331..8be5a85b 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 @@ -58,6 +58,7 @@ git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0006.patch git apply $cvePatchesLinux/CVE-2017-17558/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-5972/ANY/0002.patch git apply $cvePatchesLinux/CVE-2017-7533/3.10/0002.patch +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 @@ -65,5 +66,5 @@ 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.p65" +editKernelLocalversion "-dos.p66" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh index fed09891..59d6b1a7 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_fairphone_msm8974.sh @@ -8,6 +8,7 @@ git apply $cvePatchesLinux/CVE-2016-0774/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-7117/^4.5/0002.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0786/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-12153/3.2-^3.16/0001.patch git apply $cvePatchesLinux/CVE-2017-13080/ANY/0002.patch @@ -27,7 +28,6 @@ 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-6348/^4.9/0001.patch -git apply $cvePatchesLinux/CVE-2017-7533/3.4/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.p30" 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 4befdb57..627bb6a4 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 @@ -89,6 +89,7 @@ git apply $cvePatchesLinux/CVE-2017-0749/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0794/3.18/0002.patch git apply $cvePatchesLinux/CVE-2017-0866/3.18/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-1000364/3.18/0008.patch git apply $cvePatchesLinux/CVE-2017-1000364/3.18/0009.patch git apply $cvePatchesLinux/CVE-2017-1000364/3.18/0010.patch @@ -138,6 +139,8 @@ git apply $cvePatchesLinux/CVE-2017-14891/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-14892/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-14897/3.18/0002.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/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-15847/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15850/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.18/0003.patch @@ -175,7 +178,7 @@ git apply $cvePatchesLinux/CVE-2017-7371/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-7372/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-7472/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-7533/3.18/0003.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-2017-8247/ANY/0001.patch @@ -206,5 +209,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.p206" +editKernelLocalversion "-dos.p209" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh index 816cc378..31b93261 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -9,6 +9,7 @@ git apply $cvePatchesLinux/CVE-2016-8404/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-0786/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch @@ -28,5 +29,5 @@ 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.p28" +editKernelLocalversion "-dos.p29" 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 b390419b..d7bbd57f 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 @@ -108,5 +108,6 @@ git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3- 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.p108" +git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch +editKernelLocalversion "-dos.p109" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh index 9425146e..66ab3948 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh @@ -12,6 +12,7 @@ git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0611/3.4/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0786/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch 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 @@ -30,5 +31,5 @@ git apply $cvePatchesLinux/CVE-2017-17558/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-8246/3.4/0002.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.p30" +editKernelLocalversion "-dos.p31" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh index 95fd638e..3c36c8d8 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_hammerhead.sh @@ -14,6 +14,7 @@ git apply $cvePatchesLinux/CVE-2017-0710/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0751/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0786/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11089/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch @@ -41,5 +42,5 @@ git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch git apply $cvePatchesLinux/CVE-2017-9684/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.p41" +editKernelLocalversion "-dos.p42" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh index 275d4cc3..a013cef8 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_mako.sh @@ -5,6 +5,7 @@ git apply $cvePatchesLinux/CVE-2013-4738/ANY/0002.patch git apply $cvePatchesLinux/CVE-2016-3857/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-3894/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-9793/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-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch @@ -16,5 +17,5 @@ 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/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch -editKernelLocalversion "-dos.p16" +editKernelLocalversion "-dos.p17" 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 9787791d..3616880e 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 @@ -99,6 +99,8 @@ git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-14877/3.10/0001.patch 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-15850/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0002.patch @@ -162,7 +164,8 @@ 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-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.p164" +editKernelLocalversion "-dos.p167" 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 69247f5c..0fc788ef 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 @@ -61,6 +61,7 @@ git apply $cvePatchesLinux/CVE-2017-0610/ANY/0002.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0794/3.18/0002.patch git apply $cvePatchesLinux/CVE-2017-0866/3.18/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-1000364/3.18/0008.patch git apply $cvePatchesLinux/CVE-2017-1000364/3.18/0009.patch git apply $cvePatchesLinux/CVE-2017-1000364/3.18/0010.patch @@ -76,6 +77,8 @@ git apply $cvePatchesLinux/CVE-2017-13218/3.18/0006.patch git apply $cvePatchesLinux/CVE-2017-13218/3.18/0011.patch git apply $cvePatchesLinux/CVE-2017-13245/ANY/0001.patch 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-15868/3.18/0003.patch git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch @@ -98,6 +101,7 @@ 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-17769/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-18066/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-5986/^4.9/0001.patch @@ -108,7 +112,7 @@ git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-6353/^4.10/0001.patch git apply $cvePatchesLinux/CVE-2017-7472/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch -git apply $cvePatchesLinux/CVE-2017-7533/3.18/0003.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/Untracked/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch @@ -121,5 +125,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.p121" +editKernelLocalversion "-dos.p125" cd $base 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 63c2522a..a8f20216 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 @@ -69,11 +69,12 @@ git apply $cvePatchesLinux/CVE-2017-17558/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-5972/ANY/0002.patch 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/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.p75" +editKernelLocalversion "-dos.p76" 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 6b51061a..cc19594b 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 @@ -119,6 +119,8 @@ git apply $cvePatchesLinux/CVE-2017-13245/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch 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-15850/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0002.patch @@ -160,6 +162,7 @@ git apply $cvePatchesLinux/CVE-2017-7373/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-7472/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-7533/3.10/0002.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-2017-8236/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-8243/3.10/0001.patch @@ -189,7 +192,8 @@ git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3- 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 git apply $cvePatchesLinux/CVE-2017-15845/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch -editKernelLocalversion "-dos.p191" +editKernelLocalversion "-dos.p195" 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 0a777cd2..bf627cf1 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 @@ -55,6 +55,7 @@ git apply $cvePatchesLinux/CVE-2017-17558/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-17762/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-6345/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-7533/3.10/0002.patch +git apply $cvePatchesLinux/CVE-2017-7533/3.10/0003.patch 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 @@ -63,5 +64,5 @@ 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.p63" +editKernelLocalversion "-dos.p64" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh index dc57a1f0..5d5891a3 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh @@ -17,6 +17,7 @@ git apply $cvePatchesLinux/CVE-2017-0648/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0751/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0786/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-1000380/^4.11/0001.patch git apply $cvePatchesLinux/CVE-2017-11000/ANY/0002.patch git apply $cvePatchesLinux/CVE-2017-11019/ANY/0001.patch @@ -47,5 +48,5 @@ git apply $cvePatchesLinux/CVE-2017-9684/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-9706/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.p47" +editKernelLocalversion "-dos.p48" 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 544e4e61..522e81c0 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 @@ -26,6 +26,7 @@ git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0751/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0786/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0791/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-1000380/^4.11/0001.patch git apply $cvePatchesLinux/CVE-2017-11015/prima/0001.patch git apply $cvePatchesLinux/CVE-2017-11015/prima/0002.patch @@ -54,5 +55,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.p54" +editKernelLocalversion "-dos.p55" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh index a6ea8352..3d3b41bb 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh @@ -6,6 +6,7 @@ git apply $cvePatchesLinux/CVE-2016-2475/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-4578/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0611/3.4/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 @@ -23,5 +24,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.p23" +editKernelLocalversion "-dos.p24" 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 7ec09547..442bf8fe 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 @@ -46,5 +46,6 @@ git apply $cvePatchesLinux/CVE-2017-7184/ANY/0002.patch 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 -editKernelLocalversion "-dos.p46" +git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch +editKernelLocalversion "-dos.p47" 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 633e0140..1c56d1cf 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 @@ -59,7 +59,7 @@ git apply $cvePatchesLinux/CVE-2016-6828/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-7042/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-7117/^4.5/0002.patch git apply $cvePatchesLinux/CVE-2016-7913/ANY/0001.patch -#git apply $cvePatchesLinux/CVE-2016-7917/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2016-7917/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-8399/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-8468/3.18/0001.patch git apply $cvePatchesLinux/CVE-2016-8650/ANY/0001.patch @@ -141,5 +141,6 @@ git apply $cvePatchesLinux/Untracked/ANY/0007-USB-usbip-fix-potential-out-of-bou git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch #git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0039.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p141" +git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch +editKernelLocalversion "-dos.p142" cd $base diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 9c799446..42642273 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -58,11 +58,11 @@ export -f buildDevice; buildAll() { #Select devices are userdebug due to SELinux policy issues #TODO: Add victara, griffin, athene, us997, us996, pme, t0lte, hlte - brunch lineage_clark-user; brunch lineage_d852-userdebug; brunch lineage_bacon-user; brunch lineage_thor-userdebug; brunch lineage_mako-user; + brunch lineage_clark-user; brunch lineage_d855-userdebug; brunch lineage_ether-user; brunch lineage_FP2-user; diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 8a16e1f9..d6d35346 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -202,10 +202,6 @@ sed -i 's/shouldUseOptimizations(weight)/true/' cm/lib/main/java/org/cyanogenmod enterAndClear "device/amazon/hdx-common" echo "/dev/block/platform/msm_sdcc.1/by-name/misc /misc emmc defaults defaults" >> rootdir/etc/fstab.qcom; #Add the misc (mmcblk0p5) partition for recovery flags -enterAndClear "device/motorola/clark" -git revert 6a116d3d47a23fb33a064916995cbb3b265cf32f -patch -p1 < $patches"android_device_motorola_clark/0001-Tri_State_Torch.patch" #Tri-state torch - enterAndClear "device/oneplus/bacon" sed -i "s/TZ.BF.2.0-2.0.0134/TZ.BF.2.0-2.0.0134|TZ.BF.2.0-2.0.0137/" board-info.txt; #Suport new TZ firmware https://review.lineageos.org/#/c/178999/