From 7da9d77ed37570fb8d5b8c5c2ab024c120c1521c Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 7 Nov 2017 19:12:41 -0500 Subject: [PATCH] Patcher updates --- .../android_kernel_amazon_hdx-common.sh | 107 ++++++++++-------- .../android_kernel_motorola_msm8992.sh | 9 +- 2 files changed, 65 insertions(+), 51 deletions(-) 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 ce5d7c22..e41835bd 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 @@ -1,53 +1,60 @@ #!/bin/bash cd $base"kernel/amazon/hdx-common" -git apply $cvePatches/CVE-2012-6704/^3.5/0001.patch -git apply $cvePatches/CVE-2014-1739/ANY/0001.patch -git apply $cvePatches/CVE-2014-4656/ANY/0001.patch -git apply $cvePatches/CVE-2014-8709/ANY/0001.patch -git apply $cvePatches/CVE-2014-9420/ANY/0001.patch -git apply $cvePatches/CVE-2014-9781/ANY/0001.patch -git apply $cvePatches/CVE-2014-9880/ANY/0001.patch -git apply $cvePatches/CVE-2015-1593/ANY/0001.patch -git apply $cvePatches/CVE-2015-6640/ANY/0001.patch -git apply $cvePatches/CVE-2016-10230/ANY/0001.patch -git apply $cvePatches/CVE-2016-2185/ANY/0001.patch -git apply $cvePatches/CVE-2016-2186/ANY/0001.patch -git apply $cvePatches/CVE-2016-2443/ANY/0001.patch -git apply $cvePatches/CVE-2016-2488/ANY/0001.patch -git apply $cvePatches/CVE-2016-2544/ANY/0001.patch -git apply $cvePatches/CVE-2016-3857/ANY/0001.patch -git apply $cvePatches/CVE-2016-3892/ANY/0001.patch -git apply $cvePatches/CVE-2016-3893/ANY/0001.patch -git apply $cvePatches/CVE-2016-3894/ANY/0001.patch -git apply $cvePatches/CVE-2016-6672/ANY/0001.patch -git apply $cvePatches/CVE-2016-6751/ANY/0001.patch -git apply $cvePatches/CVE-2016-6753/ANY/0001.patch -git apply $cvePatches/CVE-2016-8404/ANY/0001.patch -git apply $cvePatches/CVE-2016-8417/ANY/0001.patch -git apply $cvePatches/CVE-2016-8444/ANY/0001.patch -git apply $cvePatches/CVE-2016-8650/ANY/0001.patch -git apply $cvePatches/CVE-2016-9604/ANY/0001.patch -git apply $cvePatches/CVE-2016-9793/ANY/0001.patch -git apply $cvePatches/CVE-2016-9794/ANY/0001.patch -git apply $cvePatches/CVE-2017-0404/^3.18/0001.patch -git apply $cvePatches/CVE-2017-0611/ANY/0001.patch -git apply $cvePatches/CVE-2017-0648/ANY/0001.patch -git apply $cvePatches/CVE-2017-0710/ANY/0001.patch -git apply $cvePatches/CVE-2017-0751/ANY/0001.patch -git apply $cvePatches/CVE-2017-0786/ANY/0001.patch -git apply $cvePatches/CVE-2017-11000/ANY/0001.patch -git apply $cvePatches/CVE-2017-11059/ANY/0001.patch -git apply $cvePatches/CVE-2017-13080/ANY/0001.patch -git apply $cvePatches/CVE-2017-15265/^4.14/0001.patch -git apply $cvePatches/CVE-2017-2671/^4.10/0001.patch -git apply $cvePatches/CVE-2017-5970/ANY/0001.patch -git apply $cvePatches/CVE-2017-6074/ANY/0001.patch -git apply $cvePatches/CVE-2017-6345/^4.9/0001.patch -git apply $cvePatches/CVE-2017-6348/^4.9/0001.patch -git apply $cvePatches/CVE-2017-6951/^3.14/0001.patch -git apply $cvePatches/CVE-2017-7187/ANY/0001.patch -git apply $cvePatches/CVE-2017-7487/ANY/0001.patch -git apply $cvePatches/CVE-2017-8247/ANY/0001.patch -git apply $cvePatches/CVE-2017-9242/^4.11/0001.patch -git apply $cvePatches/CVE-2017-9706/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2012-6703/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2012-6704/^3.5/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2014-1739/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2014-4656/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2014-8709/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2014-9420/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2014-9781/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2014-9880/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2015-1593/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2015-6640/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-10230/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-1583/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-2185/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-2186/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-2443/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-2488/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-2544/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-3857/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-3865/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-3892/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-3893/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-3894/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-6672/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-6751/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-6753/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-8404/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-8417/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-8444/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-8650/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-9604/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-9793/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-9794/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-0404/^3.18/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-0524/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-0611/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-0648/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-0710/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-0751/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-0786/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-1000380/^4.11/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-11000/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-11059/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-13080/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-15265/^4.14/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-2671/^4.10/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-5970/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-6074/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-6345/^4.9/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-6348/^4.9/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-6951/^3.14/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-7187/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-7308/ANY/0003.patch +git apply --whitespace=fix $cvePatches/CVE-2017-7487/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-8247/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-9242/^4.11/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-9684/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-9706/ANY/0001.patch 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 a5453241..c7b69af2 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 @@ -1,5 +1,6 @@ #!/bin/bash cd $base"kernel/motorola/msm8992" +git apply --whitespace=fix $cvePatches/CVE-2012-6703/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2014-9781/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2015-0573/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2015-8019/3.10/0001.patch @@ -9,6 +10,7 @@ git apply --whitespace=fix $cvePatches/CVE-2016-0843/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2016-10200/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2016-10230/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2016-10232/3.10/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-1583/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2016-2063/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2016-3070/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2016-3857/ANY/0001.patch @@ -21,6 +23,8 @@ git apply --whitespace=fix $cvePatches/CVE-2016-3902/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2016-3907/3.10/0002.patch git apply --whitespace=fix $cvePatches/CVE-2016-3938/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2016-5853/3.10/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-5858/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-5858/ANY/0002.patch git apply --whitespace=fix $cvePatches/CVE-2016-5859/3.10/0001.patch git apply --whitespace=fix $cvePatches/CVE-2016-5867/3.10/0001.patch git apply --whitespace=fix $cvePatches/CVE-2016-5868/3.10/0001.patch @@ -33,16 +37,17 @@ git apply --whitespace=fix $cvePatches/CVE-2016-7913/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2016-8417/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2016-8444/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2016-8477/3.10/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2016-8481/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2016-8650/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2016-9604/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-0404/^3.18/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-0427/3.10/0001.patch -git apply --whitespace=fix $cvePatches/CVE-2017-0436/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-0452/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-0454/3.10/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-0457/3.10/0002.patch git apply --whitespace=fix $cvePatches/CVE-2017-0460/3.10/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-0516/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-0524/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-0537/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-0604/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-0606/ANY/0001.patch @@ -58,6 +63,7 @@ git apply --whitespace=fix $cvePatches/CVE-2017-0750/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-0751/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-0794/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-1000365/3.10/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-1000380/^4.11/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-10997/3.10/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-10998/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-11024/ANY/0001.patch @@ -74,6 +80,7 @@ git apply --whitespace=fix $cvePatches/CVE-2017-6345/^4.9/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-6348/^4.9/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-6951/^3.14/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-7187/ANY/0001.patch +git apply --whitespace=fix $cvePatches/CVE-2017-7308/ANY/0003.patch git apply --whitespace=fix $cvePatches/CVE-2017-7369/3.10/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-7472/ANY/0001.patch git apply --whitespace=fix $cvePatches/CVE-2017-7487/ANY/0001.patch