From 426d32fda53ebf33b1e70e3c4843cce104324d9a Mon Sep 17 00:00:00 2001 From: Tad Date: Thu, 7 Dec 2017 01:04:22 -0500 Subject: [PATCH] Update CVE patchers using recoded patcher --- .../CVE_Patchers/android_kernel_amazon_hdx-common.sh | 4 ++++ .../CVE_Patchers/android_kernel_fairphone_msm8974.sh | 4 ++++ .../CVE_Patchers/android_kernel_google_marlin.sh | 9 ++++++++- .../CVE_Patchers/android_kernel_google_msm.sh | 6 ++++++ .../CVE_Patchers/android_kernel_htc_msm8994.sh | 8 +++++++- .../CVE_Patchers/android_kernel_huawei_angler.sh | 2 ++ .../CVE_Patchers/android_kernel_lge_bullhead.sh | 2 ++ .../CVE_Patchers/android_kernel_moto_shamu.sh | 2 ++ .../CVE_Patchers/android_kernel_motorola_msm8992.sh | 5 +++++ .../CVE_Patchers/android_kernel_samsung_jf.sh | 2 ++ .../CVE_Patchers/android_kernel_samsung_smdk4412.sh | 2 ++ .../CVE_Patchers/android_kernel_samsung_universal8890.sh | 5 ++++- 12 files changed, 48 insertions(+), 3 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 a70c90b0..541946ad 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 @@ -49,6 +49,10 @@ git apply $cvePatches/CVE-2017-11059/ANY/0001.patch git apply $cvePatches/CVE-2017-11090/ANY/0001.patch git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatches/CVE-2017-13080/ANY/0001.patch +git apply $cvePatches/CVE-2017-13080-Extra/ANY/0001.patch +git apply $cvePatches/CVE-2017-13080-Extra/ANY/0002.patch +git apply $cvePatches/CVE-2017-13080-Extra/ANY/0003.patch +git apply $cvePatches/CVE-2017-13080-Extra/ANY/0004.patch git apply $cvePatches/CVE-2017-15265/^4.14/0001.patch git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch 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 e83dfb98..44d3c736 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 @@ -9,6 +9,10 @@ git apply $cvePatches/CVE-2017-0786/ANY/0001.patch git apply $cvePatches/CVE-2017-11059/ANY/0001.patch git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatches/CVE-2017-13080/ANY/0001.patch +git apply $cvePatches/CVE-2017-13080-Extra/ANY/0001.patch +git apply $cvePatches/CVE-2017-13080-Extra/ANY/0002.patch +git apply $cvePatches/CVE-2017-13080-Extra/ANY/0003.patch +git apply $cvePatches/CVE-2017-13080-Extra/ANY/0004.patch git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch git apply $cvePatches/CVE-2017-16533/^4.13/0001.patch 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 597fdc1b..8c12d0d7 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 @@ -34,6 +34,8 @@ git apply $cvePatches/CVE-2015-7515/^4.4/0002.patch git apply $cvePatches/CVE-2015-8966/3.15+/0001.patch git apply $cvePatches/CVE-2016-10088/ANY/0001.patch git apply $cvePatches/CVE-2016-2187/ANY/0001.patch +git apply $cvePatches/CVE-2016-2188/ANY/0001.patch +git apply $cvePatches/CVE-2016-2188/ANY/0002.patch git apply $cvePatches/CVE-2016-2544/ANY/0001.patch git apply $cvePatches/CVE-2016-2549/^4.4/0001.patch git apply $cvePatches/CVE-2016-2847/ANY/0001.patch @@ -80,6 +82,9 @@ git apply $cvePatches/CVE-2017-0627/ANY/0001.patch git apply $cvePatches/CVE-2017-0749/ANY/0001.patch git apply $cvePatches/CVE-2017-0750/ANY/0001.patch git apply $cvePatches/CVE-2017-0866/3.18/0001.patch +git apply $cvePatches/CVE-2017-1000364/3.18/0008.patch +git apply $cvePatches/CVE-2017-1000364/3.18/0009.patch +git apply $cvePatches/CVE-2017-1000364/3.18/0010.patch git apply $cvePatches/CVE-2017-1000365/3.18/0002.patch git apply $cvePatches/CVE-2017-1000380/^4.11/0001.patch git apply $cvePatches/CVE-2017-10998/3.18/0002.patch @@ -87,10 +92,12 @@ git apply $cvePatches/CVE-2017-11001/ANY/0001.patch git apply $cvePatches/CVE-2017-11002/ANY/0002.patch git apply $cvePatches/CVE-2017-11013/qcacld-2.0/0002.patch git apply $cvePatches/CVE-2017-11014/qcacld-2.0/0001.patch +git apply $cvePatches/CVE-2017-11015/qcacld-2.0/0003.patch +git apply $cvePatches/CVE-2017-11015/qcacld-2.0/0004.patch git apply $cvePatches/CVE-2017-11016/ANY/0001.patch git apply $cvePatches/CVE-2017-11019/ANY/0001.patch git apply $cvePatches/CVE-2017-11025/ANY/0001.patch -git apply $cvePatches/CVE-2017-11028/3.18/0001.patch +git apply $cvePatches/CVE-2017-11028/3.18/0001.patch git apply $cvePatches/CVE-2017-11030/3.18/0001.patch git apply $cvePatches/CVE-2017-11031/ANY/0001.patch git apply $cvePatches/CVE-2017-11032/ANY/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh index 748a0626..c0f71608 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_msm.sh @@ -14,10 +14,16 @@ git apply $cvePatches/CVE-2017-0710/ANY/0001.patch git apply $cvePatches/CVE-2017-0750/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-11015/prima/0001.patch +git apply $cvePatches/CVE-2017-11015/prima/0002.patch git apply $cvePatches/CVE-2017-11089/ANY/0001.patch git apply $cvePatches/CVE-2017-11090/ANY/0001.patch git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatches/CVE-2017-13080/ANY/0001.patch +git apply $cvePatches/CVE-2017-13080-Extra/ANY/0001.patch +git apply $cvePatches/CVE-2017-13080-Extra/ANY/0002.patch +git apply $cvePatches/CVE-2017-13080-Extra/ANY/0003.patch +git apply $cvePatches/CVE-2017-13080-Extra/ANY/0004.patch git apply $cvePatches/CVE-2017-15265/^4.14/0001.patch git apply $cvePatches/CVE-2017-16526/^4.13/0001.patch git apply $cvePatches/CVE-2017-16532/^4.13/0001.patch 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 5936c596..80cbd485 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 @@ -34,6 +34,8 @@ git apply $cvePatches/CVE-2016-10234/3.10/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-2187/ANY/0001.patch +git apply $cvePatches/CVE-2016-2188/ANY/0001.patch +git apply $cvePatches/CVE-2016-2188/ANY/0002.patch git apply $cvePatches/CVE-2016-2544/ANY/0001.patch git apply $cvePatches/CVE-2016-3136/ANY/0001.patch git apply $cvePatches/CVE-2016-3137/ANY/0001.patch @@ -57,9 +59,11 @@ git apply $cvePatches/CVE-2016-6672/ANY/0001.patch git apply $cvePatches/CVE-2016-6693/ANY/0001.patch git apply $cvePatches/CVE-2016-6696/ANY/0001.patch git apply $cvePatches/CVE-2016-6738/ANY/0001.patch -#git apply $cvePatches/CVE-2016-6741/3.10/0001.patch +git apply $cvePatches/CVE-2016-6741/3.10/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-7097/3.10/0002.patch +git apply $cvePatches/CVE-2016-7097/3.10/0003.patch git apply $cvePatches/CVE-2016-7117/^4.5/0002.patch git apply $cvePatches/CVE-2016-7910/ANY/0001.patch git apply $cvePatches/CVE-2016-7913/ANY/0001.patch @@ -149,6 +153,8 @@ git apply $cvePatches/CVE-2017-6074/^4.9/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-7184/ANY/0001.patch +git apply $cvePatches/CVE-2017-7184/ANY/0002.patch git apply $cvePatches/CVE-2017-7308/ANY/0003.patch git apply $cvePatches/CVE-2017-7369/3.10/0001.patch git apply $cvePatches/CVE-2017-7373/3.10/0001.patch 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 e6b740ad..90fcf64c 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 @@ -33,6 +33,8 @@ git apply $cvePatches/CVE-2016-2063/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-2187/ANY/0001.patch +git apply $cvePatches/CVE-2016-2188/ANY/0001.patch +git apply $cvePatches/CVE-2016-2188/ANY/0002.patch git apply $cvePatches/CVE-2016-2384/^4.5/0001.patch git apply $cvePatches/CVE-2016-2438/ANY/0001.patch git apply $cvePatches/CVE-2016-2469/3.10/0001.patch 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 d47c6600..dcea3e96 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 @@ -32,6 +32,8 @@ git apply $cvePatches/CVE-2016-2063/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-2187/ANY/0001.patch +git apply $cvePatches/CVE-2016-2188/ANY/0001.patch +git apply $cvePatches/CVE-2016-2188/ANY/0002.patch git apply $cvePatches/CVE-2016-2384/^4.5/0001.patch git apply $cvePatches/CVE-2016-2438/ANY/0001.patch git apply $cvePatches/CVE-2016-2469/3.10/0001.patch 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 b2d5274b..e6795cb6 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 @@ -32,6 +32,8 @@ git apply $cvePatches/CVE-2016-10208/3.10-^3.16/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-2187/ANY/0001.patch +git apply $cvePatches/CVE-2016-2188/ANY/0001.patch +git apply $cvePatches/CVE-2016-2188/ANY/0002.patch git apply $cvePatches/CVE-2016-2475/ANY/0001.patch git apply $cvePatches/CVE-2016-2544/ANY/0001.patch git apply $cvePatches/CVE-2016-2545/^4.4/0001.patch 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 f71b4b1e..fdeecfb3 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 @@ -123,6 +123,11 @@ git apply $cvePatches/CVE-2017-6074/^4.9/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-7184/ANY/0001.patch +git apply $cvePatches/CVE-2017-7184/ANY/0002.patch +git apply $cvePatches/CVE-2017-7187/3.10/0004.patch +git apply $cvePatches/CVE-2017-7187/3.10/0005.patch +git apply $cvePatches/CVE-2017-7187/3.10/0006.patch git apply $cvePatches/CVE-2017-7308/ANY/0003.patch git apply $cvePatches/CVE-2017-7369/3.10/0001.patch git apply $cvePatches/CVE-2017-7373/3.10/0001.patch 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 e5efa79b..f2d64bc1 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 @@ -25,6 +25,8 @@ git apply $cvePatches/CVE-2017-0751/ANY/0001.patch git apply $cvePatches/CVE-2017-0786/ANY/0001.patch git apply $cvePatches/CVE-2017-0791/ANY/0001.patch git apply $cvePatches/CVE-2017-1000380/^4.11/0001.patch +git apply $cvePatches/CVE-2017-11015/prima/0001.patch +git apply $cvePatches/CVE-2017-11015/prima/0002.patch git apply $cvePatches/CVE-2017-11089/ANY/0001.patch git apply $cvePatches/CVE-2017-11090/ANY/0001.patch git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch 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 976d8881..9db99337 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 @@ -37,6 +37,8 @@ git apply $cvePatches/CVE-2017-16USB/ANY/0006.patch git apply $cvePatches/CVE-2017-6074/^4.9/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-7184/ANY/0001.patch +git apply $cvePatches/CVE-2017-7184/ANY/0002.patch git apply $cvePatches/CVE-2017-7308/ANY/0003.patch git apply $cvePatches/CVE-2017-7487/ANY/0001.patch 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 c890c3dc..3e5b9369 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 @@ -40,6 +40,8 @@ git apply $cvePatches/CVE-2016-10200/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-2187/ANY/0001.patch +git apply $cvePatches/CVE-2016-2188/ANY/0001.patch +git apply $cvePatches/CVE-2016-2188/ANY/0002.patch git apply $cvePatches/CVE-2016-3136/ANY/0001.patch git apply $cvePatches/CVE-2016-3137/ANY/0001.patch git apply $cvePatches/CVE-2016-3140/ANY/0001.patch @@ -115,7 +117,8 @@ git apply $cvePatches/CVE-2017-6353/^4.10/0001.patch git apply $cvePatches/CVE-2017-7308/ANY/0003.patch git apply $cvePatches/CVE-2017-7472/ANY/0001.patch git apply $cvePatches/CVE-2017-7487/ANY/0001.patch -git apply $cvePatches/CVE-2017-7495/3.18/0001.patch $cvePatches/CVE-2017-7495/3.18/0002.patch +git apply $cvePatches/CVE-2017-7495/3.18/0001.patch +git apply $cvePatches/CVE-2017-7495/3.18/0002.patch git apply $cvePatches/CVE-2017-7616/^4.10/0001.patch git apply $cvePatches/CVE-2017-7618/^4.10/0002.patch git apply $cvePatches/Untracked/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch