diff --git a/Misc/Features/Recovery_Updates.txt b/Misc/Features/Recovery_Updates.txt new file mode 100644 index 00000000..de669931 --- /dev/null +++ b/Misc/Features/Recovery_Updates.txt @@ -0,0 +1,3 @@ +install-recovery.sh + +service flash_recovery /system/bin/install-recovery.sh diff --git a/Misc/Features/misc_build_flags.txt b/Misc/Features/misc_build_flags.txt new file mode 100644 index 00000000..8c4eb14c --- /dev/null +++ b/Misc/Features/misc_build_flags.txt @@ -0,0 +1 @@ +TARGET_BOOTIMG_SIGNED diff --git a/Patches/Linux b/Patches/Linux index e2ba58f4..aa3cf353 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit e2ba58f4cc36c9acec30decc511a7dbf7681d55f +Subproject commit aa3cf3537e013f9e07170a2678798e40f906b023 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 d297c9f6..a9fc38d8 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 @@ -68,7 +68,7 @@ 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-2671/^4.10/0001.patch -git apply $cvePatchesLinux/CVE-2017-5970/^4.9/0001.patch +git apply $cvePatchesLinux/CVE-2017-5970/^4.9/0002.patch git apply $cvePatchesLinux/CVE-2017-6074/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-6345/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch 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 53af62b5..96463e65 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 @@ -26,6 +26,7 @@ git apply $cvePatchesLinux/CVE-2016-8394/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-8481/ANY/0003.patch git apply $cvePatchesLinux/CVE-2017-0648/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000410/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11033/3.10/0002.patch git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11600/3.10/0001.patch @@ -52,6 +53,7 @@ git apply $cvePatchesLinux/CVE-2017-16939/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0003.patch 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-8281/3.10/0001.patch @@ -60,5 +62,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.p60" +editKernelLocalversion "-dos.p62" cd $base 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 51965ffa..c388d62b 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 @@ -85,12 +85,14 @@ git apply $cvePatchesLinux/CVE-2017-0622/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-0627/ANY/0001.patch 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-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 git apply $cvePatchesLinux/CVE-2017-1000365/3.18/0002.patch git apply $cvePatchesLinux/CVE-2017-1000380/^4.11/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000410/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-10998/3.18/0002.patch git apply $cvePatchesLinux/CVE-2017-11001/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11002/ANY/0002.patch @@ -148,6 +150,7 @@ 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-16USB/ANY/0009.patch +git apply $cvePatchesLinux/CVE-2017-17558/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-2671/^4.10/0001.patch git apply $cvePatchesLinux/CVE-2017-5669/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-5972/ANY/0002.patch @@ -192,5 +195,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.p192" +editKernelLocalversion "-dos.p195" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_flounder.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_flounder.sh index 86a2812d..4a9a451a 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_flounder.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_flounder.sh @@ -34,6 +34,7 @@ git apply $cvePatchesLinux/CVE-2017-0861/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-0862/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-1000365/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-1000380/^4.11/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000410/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-10996/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11089/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch @@ -58,9 +59,10 @@ git apply $cvePatchesLinux/CVE-2017-16939/3.10/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/CVE-2017-2671/^4.10/0001.patch git apply $cvePatchesLinux/CVE-2017-5669/^4.9/0001.patch -git apply $cvePatchesLinux/CVE-2017-5970/^4.9/0001.patch +git apply $cvePatchesLinux/CVE-2017-5970/^4.9/0002.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 @@ -72,5 +74,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-2475/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p72" +editKernelLocalversion "-dos.p74" 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 d2609878..b2c157e7 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 @@ -24,7 +24,8 @@ 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.p26" +editKernelLocalversion "-dos.p27" 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 606cca16..0c46a98d 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 @@ -48,6 +48,7 @@ git apply $cvePatchesLinux/CVE-2017-0861/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-0862/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-1000365/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-1000380/^4.11/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000410/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11033/3.10/0002.patch git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11600/3.10/0001.patch @@ -84,6 +85,7 @@ git apply $cvePatchesLinux/CVE-2017-16939/3.10/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/CVE-2017-2618/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-2671/^4.10/0001.patch git apply $cvePatchesLinux/CVE-2017-5669/^4.9/0001.patch @@ -104,5 +106,5 @@ 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.p104" +editKernelLocalversion "-dos.p106" cd $base 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 7e036df0..cc72656d 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 @@ -76,6 +76,7 @@ git apply $cvePatchesLinux/CVE-2017-0648/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0824/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-1000365/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-1000380/^4.11/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000410/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11016/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11030/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-11033/3.10/0001.patch @@ -119,6 +120,7 @@ git apply $cvePatchesLinux/CVE-2017-16939/3.10/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/CVE-2017-2618/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-2671/^4.10/0001.patch git apply $cvePatchesLinux/CVE-2017-5669/^4.9/0001.patch @@ -143,5 +145,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.p143" +editKernelLocalversion "-dos.p145" cd $base 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 5dbed6d3..e2da417f 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 @@ -70,6 +70,7 @@ git apply $cvePatchesLinux/CVE-2017-0564/3.10/0002.patch git apply $cvePatchesLinux/CVE-2017-0648/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-1000365/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-1000380/^4.11/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000410/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11016/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11030/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-11033/3.10/0001.patch @@ -113,6 +114,7 @@ git apply $cvePatchesLinux/CVE-2017-16939/3.10/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/CVE-2017-2618/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-2671/^4.10/0001.patch git apply $cvePatchesLinux/CVE-2017-5669/^4.9/0001.patch @@ -134,5 +136,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.p134" +editKernelLocalversion "-dos.p136" 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 e809b9f6..b6936b0a 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 @@ -25,8 +25,9 @@ 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/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.p28" +editKernelLocalversion "-dos.p29" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh index 146592ae..531b8851 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh @@ -21,8 +21,9 @@ 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/CVE-2017-7487/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.p24" +editKernelLocalversion "-dos.p25" 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 dc8ee094..03ba4333 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 @@ -116,10 +116,11 @@ git apply $cvePatchesLinux/CVE-2017-16939/3.10/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/CVE-2017-2618/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-2671/^4.10/0001.patch git apply $cvePatchesLinux/CVE-2017-5669/^4.9/0001.patch -git apply $cvePatchesLinux/CVE-2017-5970/^4.9/0001.patch +git apply $cvePatchesLinux/CVE-2017-5970/^4.9/0002.patch git apply $cvePatchesLinux/CVE-2017-6074/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-6345/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch @@ -160,5 +161,5 @@ 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 git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch -editKernelLocalversion "-dos.p160" +editKernelLocalversion "-dos.p161" 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 cdd65fea..ee25c555 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 @@ -58,12 +58,14 @@ git apply $cvePatchesLinux/CVE-2016-GadgetFS/ANY/0010.patch git apply $cvePatchesLinux/CVE-2017-0564/3.18/0004.patch 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-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 git apply $cvePatchesLinux/CVE-2017-1000365/3.18/0002.patch git apply $cvePatchesLinux/CVE-2017-1000380/^4.11/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000410/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11031/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-12146/3.16+/0001.patch @@ -91,6 +93,7 @@ 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-16USB/ANY/0009.patch +git apply $cvePatchesLinux/CVE-2017-17558/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 @@ -114,5 +117,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.p114" +editKernelLocalversion "-dos.p117" cd $base diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_moto_shamu.sh index f078d000..07bd9bce 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_moto_shamu.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_moto_shamu.sh @@ -66,6 +66,7 @@ git apply $cvePatchesLinux/CVE-2017-0648/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0824/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-1000365/3.10/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000410/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11024/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11600/3.10/0001.patch @@ -87,6 +88,7 @@ git apply $cvePatchesLinux/CVE-2017-16939/3.10/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/CVE-2017-2618/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-2671/^4.10/0001.patch git apply $cvePatchesLinux/CVE-2017-5669/^4.9/0001.patch @@ -101,5 +103,5 @@ git apply $cvePatchesLinux/CVE-2017-9242/^4.11/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 git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p101" +editKernelLocalversion "-dos.p103" 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 0ee7afb5..0c3c313b 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 @@ -45,6 +45,7 @@ git apply $cvePatchesLinux/CVE-2017-0457/3.10/0002.patch git apply $cvePatchesLinux/CVE-2017-0524/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0648/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000410/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11089/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13218/3.10/0001.patch @@ -63,6 +64,7 @@ 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/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 @@ -72,5 +74,5 @@ 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.p72" +editKernelLocalversion "-dos.p74" 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 67c87fde..f3f87aed 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 @@ -89,6 +89,7 @@ git apply $cvePatchesLinux/CVE-2017-0861/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-0862/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-1000365/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-1000380/^4.11/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000410/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-10997/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-10998/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-11014/qcacld-2.0/0002.patch @@ -134,10 +135,11 @@ git apply $cvePatchesLinux/CVE-2017-16939/3.10/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/CVE-2017-2618/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-2671/^4.10/0001.patch git apply $cvePatchesLinux/CVE-2017-5669/^4.9/0001.patch -git apply $cvePatchesLinux/CVE-2017-5970/^4.9/0001.patch +git apply $cvePatchesLinux/CVE-2017-5970/^4.9/0002.patch git apply $cvePatchesLinux/CVE-2017-5972/ANY/0002.patch git apply $cvePatchesLinux/CVE-2017-6074/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-6345/^4.9/0001.patch @@ -184,5 +186,5 @@ git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15845/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch -editKernelLocalversion "-dos.p184" +editKernelLocalversion "-dos.p186" 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 bb09a95d..bf0ce7dc 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 @@ -24,6 +24,7 @@ git apply $cvePatchesLinux/CVE-2017-0648/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0861/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-0862/3.10/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000410/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11600/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-13163/3.10/0001.patch @@ -48,6 +49,7 @@ git apply $cvePatchesLinux/CVE-2017-16939/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0003.patch git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0006.patch +git apply $cvePatchesLinux/CVE-2017-17558/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-8243/3.10/0001.patch @@ -57,5 +59,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.p57" +editKernelLocalversion "-dos.p59" 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 dc82887d..cc3c5c69 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 @@ -37,6 +37,7 @@ 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/CVE-2017-7487/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-7533/3.4/0001.patch git apply $cvePatchesLinux/CVE-2017-8246/3.4/0002.patch @@ -46,5 +47,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.p46" +editKernelLocalversion "-dos.p47" 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 c88784e6..08678c58 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 @@ -45,12 +45,13 @@ 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-5970/^4.9/0001.patch +git apply $cvePatchesLinux/CVE-2017-17558/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-5970/^4.9/0002.patch git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-8254/3.4/0001.patch 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.p52" +editKernelLocalversion "-dos.p53" 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 64676c3d..f3b245fb 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 @@ -18,11 +18,12 @@ 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/CVE-2017-8246/3.4/0002.patch git apply $cvePatchesLinux/CVE-2017-8254/3.4/0001.patch 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.p24" +editKernelLocalversion "-dos.p25" 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 a8f458ba..69fcc410 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 @@ -36,6 +36,7 @@ git apply $cvePatchesLinux/CVE-2017-16537/^4.13/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/CVE-2017-6074/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-6345/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch @@ -44,5 +45,5 @@ 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.p44" +editKernelLocalversion "-dos.p45" 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 e492648b..d9498d01 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 @@ -82,8 +82,10 @@ git apply $cvePatchesLinux/CVE-2017-0627/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0710/ANY/0001.patch 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-1000380/^4.11/0001.patch +git apply $cvePatchesLinux/CVE-2017-1000410/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-10996/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11089/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch @@ -110,9 +112,10 @@ 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-16USB/ANY/0009.patch +git apply $cvePatchesLinux/CVE-2017-17558/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-2671/^4.10/0001.patch git apply $cvePatchesLinux/CVE-2017-5669/^4.9/0001.patch -git apply $cvePatchesLinux/CVE-2017-5970/^4.9/0001.patch +git apply $cvePatchesLinux/CVE-2017-5970/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-5972/ANY/0002.patch git apply $cvePatchesLinux/CVE-2017-5986/^4.9/0001.patch git apply $cvePatchesLinux/CVE-2017-6001/^4.9/0002.patch @@ -136,5 +139,5 @@ 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.p136" +editKernelLocalversion "-dos.p139" cd $base diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index f329f0db..a03b0f92 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -64,11 +64,13 @@ export -f patchWorkspace; enableDexPreOpt() { cd $base$1; - if [ -f BoardConfig.mk ]; then - echo "WITH_DEXPREOPT := true" >> BoardConfig.mk; - echo "WITH_DEXPREOPT_PIC := true" >> BoardConfig.mk; - echo "WITH_DEXPREOPT_BOOT_IMG_ONLY := true" >> BoardConfig.mk; - echo "Enabled dexpreopt for $1"; + if [ $1 != "device/amazon/thor" ]; then #Some devices won't compile + if [ -f BoardConfig.mk ]; then + echo "WITH_DEXPREOPT := true" >> BoardConfig.mk; + echo "WITH_DEXPREOPT_PIC := true" >> BoardConfig.mk; + echo "WITH_DEXPREOPT_BOOT_IMG_ONLY := true" >> BoardConfig.mk; + echo "Enabled dexpreopt for $1"; + fi; fi; cd $base; } diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 484c9aa2..404d32a6 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -173,6 +173,7 @@ patch -p1 < $patches"android_packages_services_Telephony/0001-LTE_Only.patch" #L enterAndClear "system/core" cat /tmp/ar/hosts >> rootdir/etc/hosts #Merge in our HOSTS file +git revert 0217dddeb5c16903c13ff6c75213619b79ea622b d7aa1231b6a0631f506c0c23816f2cd81645b15f #Always update recovery patch -p1 < $patches"android_system_core/0001-Harden_Mounts.patch" #Harden mounts with nodev/noexec/nosuid. Disclaimer: From CopperheadOS 13.0 enterAndClear "system/vold" @@ -188,6 +189,7 @@ cp -r $patches"android_vendor_cm/firmware_deblobber" .; cp $patches"android_vendor_cm/firmware_deblobber.mk" build/tasks/firmware_deblobber.mk; sed -i 's/CM_BUILDTYPE := UNOFFICIAL/CM_BUILDTYPE := dos/' config/common.mk; #Change buildtype sed -i 's/messaging/Silence/' config/telephony.mk; #Replace AOSP Messaging app with Silence +#sed -i 's/config_enableRecoveryUpdater">false/config_enableRecoveryUpdater">true/' overlay/common/packages/apps/Settings/res/values/config.xml; #Expose option to update recovery #sed -i 's/mka bacon/mka bacon target-files-package dist/' build/envsetup.sh; #Create target-files for incrementals enterAndClear "vendor/cmsdk"