From 397e66c977a3171abbd068a1fd1bd961ae0face7 Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 7 Nov 2017 23:45:28 -0500 Subject: [PATCH] CVE Build fixes --- .../Linux_CVEs/CVE-2016-1583/ANY/0001.patch | 41 ------------------- .../ANY/{0001.patch => 0001.patch.disabled} | 0 .../Linux_CVEs/CVE-2017-7187/^4.10/0007.patch | 33 --------------- Patches/Linux_CVEs/Fix.sh | 27 ++++-------- Patches/Linux_CVEs/Kernel_CVE_Patch_List.txt | 7 ++-- .../android_kernel_amazon_hdx-common.sh | 2 - .../android_kernel_asus_msm8916.sh | 1 - .../android_kernel_fairphone_msm8974.sh | 1 - .../android_kernel_google_marlin.sh | 2 - .../CVE_Patchers/android_kernel_google_msm.sh | 2 - .../android_kernel_htc_flounder.sh | 2 - .../android_kernel_htc_msm8974.sh | 1 - .../android_kernel_htc_msm8994.sh | 2 - .../android_kernel_huawei_angler.sh | 2 - .../android_kernel_lge_bullhead.sh | 1 - .../android_kernel_lge_hammerhead.sh | 1 - .../CVE_Patchers/android_kernel_lge_mako.sh | 1 - .../CVE_Patchers/android_kernel_moto_shamu.sh | 2 - .../android_kernel_motorola_msm8916.sh | 2 - .../android_kernel_motorola_msm8992.sh | 3 -- .../android_kernel_nextbit_msm8992.sh | 1 - .../android_kernel_oneplus_msm8974.sh | 1 - .../CVE_Patchers/android_kernel_samsung_jf.sh | 1 - .../android_kernel_samsung_msm8974.sh | 1 - .../android_kernel_samsung_smdk4412.sh | 1 - .../android_kernel_samsung_universal8890.sh | 1 - 26 files changed, 11 insertions(+), 128 deletions(-) delete mode 100644 Patches/Linux_CVEs/CVE-2016-1583/ANY/0001.patch rename Patches/Linux_CVEs/CVE-2017-0794/ANY/{0001.patch => 0001.patch.disabled} (100%) delete mode 100644 Patches/Linux_CVEs/CVE-2017-7187/^4.10/0007.patch diff --git a/Patches/Linux_CVEs/CVE-2016-1583/ANY/0001.patch b/Patches/Linux_CVEs/CVE-2016-1583/ANY/0001.patch deleted file mode 100644 index f3ede40b..00000000 --- a/Patches/Linux_CVEs/CVE-2016-1583/ANY/0001.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e54ad7f1ee263ffa5a2de9c609d58dfa27b21cd9 Mon Sep 17 00:00:00 2001 -From: Jann Horn -Date: Wed, 1 Jun 2016 11:55:05 +0200 -Subject: proc: prevent stacking filesystems on top - -This prevents stacking filesystems (ecryptfs and overlayfs) from using -procfs as lower filesystem. There is too much magic going on inside -procfs, and there is no good reason to stack stuff on top of procfs. - -(For example, procfs does access checks in VFS open handlers, and -ecryptfs by design calls open handlers from a kernel thread that doesn't -drop privileges or so.) - -Signed-off-by: Jann Horn -Cc: stable@vger.kernel.org -Signed-off-by: Linus Torvalds ---- - fs/proc/root.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/fs/proc/root.c b/fs/proc/root.c -index 361ab4e..ec649c9 100644 ---- a/fs/proc/root.c -+++ b/fs/proc/root.c -@@ -121,6 +121,13 @@ static struct dentry *proc_mount(struct file_system_type *fs_type, - if (IS_ERR(sb)) - return ERR_CAST(sb); - -+ /* -+ * procfs isn't actually a stacking filesystem; however, there is -+ * too much magic going on inside it to permit stacking things on -+ * top of it -+ */ -+ sb->s_stack_depth = FILESYSTEM_MAX_STACK_DEPTH; -+ - if (!proc_parse_options(options, ns)) { - deactivate_locked_super(sb); - return ERR_PTR(-EINVAL); --- -cgit v1.1 - diff --git a/Patches/Linux_CVEs/CVE-2017-0794/ANY/0001.patch b/Patches/Linux_CVEs/CVE-2017-0794/ANY/0001.patch.disabled similarity index 100% rename from Patches/Linux_CVEs/CVE-2017-0794/ANY/0001.patch rename to Patches/Linux_CVEs/CVE-2017-0794/ANY/0001.patch.disabled diff --git a/Patches/Linux_CVEs/CVE-2017-7187/^4.10/0007.patch b/Patches/Linux_CVEs/CVE-2017-7187/^4.10/0007.patch deleted file mode 100644 index c36739f0..00000000 --- a/Patches/Linux_CVEs/CVE-2017-7187/^4.10/0007.patch +++ /dev/null @@ -1,33 +0,0 @@ -From bf33f87dd04c371ea33feb821b60d63d754e3124 Mon Sep 17 00:00:00 2001 -From: peter chang -Date: Wed, 15 Feb 2017 14:11:54 -0800 -Subject: scsi: sg: check length passed to SG_NEXT_CMD_LEN - -The user can control the size of the next command passed along, but the -value passed to the ioctl isn't checked against the usable max command -size. - -Cc: -Signed-off-by: Peter Chang -Acked-by: Douglas Gilbert -Signed-off-by: Martin K. Petersen ---- - drivers/scsi/sg.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c -index e831e01..849ff810 100644 ---- a/drivers/scsi/sg.c -+++ b/drivers/scsi/sg.c -@@ -996,6 +996,8 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg) - result = get_user(val, ip); - if (result) - return result; -+ if (val > SG_MAX_CDB_SIZE) -+ return -ENOMEM; - sfp->next_cmd_len = (val > 0) ? val : 0; - return 0; - case SG_GET_VERSION_NUM: --- -cgit v1.1 - diff --git a/Patches/Linux_CVEs/Fix.sh b/Patches/Linux_CVEs/Fix.sh index f141973c..1cfd517a 100644 --- a/Patches/Linux_CVEs/Fix.sh +++ b/Patches/Linux_CVEs/Fix.sh @@ -15,22 +15,11 @@ #You should have received a copy of the GNU General Public License #along with this program. If not, see . -mv CVE-2016-0819/ANY/0.patch CVE-2016-0819/ANY/0.patch.disabled -mv CVE-2016-2185/ANY/1.patch CVE-2016-2185/ANY/1.patch.dupe -mv CVE-2016-2186/ANY/1.patch CVE-2016-2186/ANY/1.patch.dupe -mv CVE-2016-2187/ANY/1.patch CVE-2016-2187/ANY/1.patch.dupe -mv CVE-2016-3136/ANY/1.patch CVE-2016-3136/ANY/1.patch.dupe -mv CVE-2016-3138/ANY/1.patch CVE-2016-3138/ANY/1.patch.dupe -mv CVE-2016-3140/ANY/1.patch CVE-2016-3140/ANY/1.patch.dupe -mv CVE-2016-3689/ANY/1.patch CVE-2016-3689/ANY/1.patch.dupe -mv CVE-2017-0452/ANY/0.patch CVE-2017-0452/ANY/0.patch.dupe -mv CVE-2017-0794/3.10/0.patch CVE-2017-0794/3.10/0.patch.disabled -mv CVE-2017-5669/ANY/1.patch CVE-2017-5669/ANY/1.patch.dupe -mv CVE-2017-6074/ANY/1.patch CVE-2017-6074/ANY/1.patch.dupe -mv CVE-2017-7371/ANY/1.patch CVE-2017-7371/ANY/1.patch.dupe -mv CVE-2016-3137/ANY/1.patch CVE-2016-3137/ANY/1.patch.dupe -mv CVE-2016-0774/ANY/0.patch CVE-2016-0774/ANY/0.patch.disabled -mv CVE-2016-8399/ANY/0.patch CVE-2016-8399/ANY/0.patch.disabled -mv CVE-2016-6741/3.10/0.patch CVE-2016-6741/3.10/0.patch.disabled -mv CVE-2014-0196/ANY/0.patch CVE-2014-0196/ANY/0.patch.disabled -mv CVE-2015-2922/ANY/0.patch CVE-2015-2922/ANY/0.patch.disabled +mv CVE-2017-0794/ANY/0001.patch CVE-2017-0794/ANY/0001.patch.disabled + +#mv CVE-2016-0819/ANY/0.patch CVE-2016-0819/ANY/0.patch.disabled +#mv CVE-2016-0774/ANY/0.patch CVE-2016-0774/ANY/0.patch.disabled +#mv CVE-2016-8399/ANY/0.patch CVE-2016-8399/ANY/0.patch.disabled +#mv CVE-2016-6741/3.10/0.patch CVE-2016-6741/3.10/0.patch.disabled +#mv CVE-2014-0196/ANY/0.patch CVE-2014-0196/ANY/0.patch.disabled +#mv CVE-2015-2922/ANY/0.patch CVE-2015-2922/ANY/0.patch.disabled diff --git a/Patches/Linux_CVEs/Kernel_CVE_Patch_List.txt b/Patches/Linux_CVEs/Kernel_CVE_Patch_List.txt index 683dac28..3b62e287 100644 --- a/Patches/Linux_CVEs/Kernel_CVE_Patch_List.txt +++ b/Patches/Linux_CVEs/Kernel_CVE_Patch_List.txt @@ -430,8 +430,6 @@ CVE-2016-0758 Link - http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=23c8a812dc3c621009e4f0e5342aa4e2ede1ceaa CVE-2016-0774 Link - https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/fs/pipe.c?id=b381fbc509052d07ccf8641fd7560a25d46aaf1e -CVE-2016-0774 - Link - https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/fs/pipe.c?id=b381fbc509052d07ccf8641fd7560a25d46aaf1e CVE-2016-0801 Link - https://android.googlesource.com/kernel/msm/+/68cdc8df1cb6622980b791ce03e99c255c9888af CVE-2016-0802 @@ -538,7 +536,7 @@ CVE-2016-10295 CVE-2016-10296 Link - https://source.codeaurora.org/quic/la/kernel/msm-3.18/commit/?id=a5e46d8635a2e28463b365aacdeab6750abd0d49 CVE-2016-1583 - Link - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e54ad7f1ee263ffa5a2de9c609d58dfa27b21cd9 +# Link - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e54ad7f1ee263ffa5a2de9c609d58dfa27b21cd9 Link - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2f36db71009304b3f0b95afacd8eba1f9f046b87 Link - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=29d6455178a09e1dc340380c582b13356227e8df CVE-2016-2053 @@ -1584,13 +1582,14 @@ CVE-2017-7184 Link - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=677e806da4d916052585301785d847c3b3e6186a Link - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f843ee6dd019bcece3e74e76ad9df0155655d0df CVE-2017-7187 + Depends Link - 3.4 - https://review.lineageos.org/#/c/182338/ Link - 3.4 - https://review.lineageos.org/#/c/182339/ Link - 3.4 - https://review.lineageos.org/#/c/182340/ Link - 3.10 - https://review.lineageos.org/#/c/175571/ Link - 3.10 - https://review.lineageos.org/#/c/175572/ Link - 3.10 - https://review.lineageos.org/#/c/175573/ - Link - ^4.10 - https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git/commit/?h=4.11/scsi-fixes&id=bf33f87dd04c371ea33feb821b60d63d754e3124 +# Link - ^4.10 - https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git/commit/?h=4.11/scsi-fixes&id=bf33f87dd04c371ea33feb821b60d63d754e3124 CVE-2017-7277 Depends Link - ^4.10 - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4ef1b2869447411ad3ef91ad7d4891a83c1a509a 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 35b57db5..d94a9ed6 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 @@ -11,7 +11,6 @@ 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-1583/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 @@ -61,7 +60,6 @@ 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-7187/^4.10/0007.patch git apply $cvePatches/CVE-2017-7187/3.4/0001.patch git apply $cvePatches/CVE-2017-7308/ANY/0003.patch git apply $cvePatches/CVE-2017-7487/ANY/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 2dff4547..11d5b17f 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 @@ -1,6 +1,5 @@ #!/bin/bash cd $base"kernel/asus/msm8916" -git apply $cvePatches/CVE-2016-1583/ANY/0001.patch 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 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 74503056..8df292a9 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 @@ -1,7 +1,6 @@ #!/bin/bash cd $base"kernel/fairphone/msm8974" git apply $cvePatches/CVE-2016-0801/ANY/0001.patch -git apply $cvePatches/CVE-2016-1583/ANY/0001.patch git apply $cvePatches/CVE-2017-0430/ANY/0001.patch git apply $cvePatches/CVE-2017-0750/ANY/0001.patch git apply $cvePatches/CVE-2017-0786/ANY/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 7de72623..a2ae482b 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 @@ -6,7 +6,6 @@ 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-10044/ANY/0001.patch git apply $cvePatches/CVE-2016-10088/ANY/0001.patch -git apply $cvePatches/CVE-2016-1583/ANY/0001.patch git apply $cvePatches/CVE-2016-2187/ANY/0001.patch git apply $cvePatches/CVE-2016-2544/ANY/0001.patch git apply $cvePatches/CVE-2016-2549/^4.4/0001.patch @@ -89,7 +88,6 @@ git apply $cvePatches/CVE-2017-6345/^4.9/0001.patch git apply $cvePatches/CVE-2017-6346/3.18/0001.patch git apply $cvePatches/CVE-2017-6348/^4.9/0001.patch git apply $cvePatches/CVE-2017-6353/^4.10/0001.patch -git apply $cvePatches/CVE-2017-7187/^4.10/0007.patch git apply $cvePatches/CVE-2017-7371/3.18/0001.patch git apply $cvePatches/CVE-2017-7372/ANY/0001.patch git apply $cvePatches/CVE-2017-7472/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 84c472af..7233a08a 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 @@ -3,7 +3,6 @@ cd $base"kernel/google/msm" git apply $cvePatches/CVE-2013-4738/ANY/0002.patch git apply $cvePatches/CVE-2014-9781/ANY/0001.patch git apply $cvePatches/CVE-2015-1593/ANY/0001.patch -git apply $cvePatches/CVE-2016-1583/ANY/0001.patch git apply $cvePatches/CVE-2016-3857/ANY/0001.patch git apply $cvePatches/CVE-2016-3894/ANY/0001.patch git apply $cvePatches/CVE-2016-8402/3.4/0001.patch @@ -25,7 +24,6 @@ git apply $cvePatches/CVE-2017-16643/ANY/0001.patch git apply $cvePatches/CVE-2017-16650/ANY/0001.patch git apply $cvePatches/CVE-2017-16USB/ANY/0001.patch git apply $cvePatches/CVE-2017-16USB/ANY/0005.patch -git apply $cvePatches/CVE-2017-7187/^4.10/0007.patch git apply $cvePatches/CVE-2017-8246/3.4/0002.patch git apply $cvePatches/CVE-2017-8254/3.4/0001.patch 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 4daa6f30..60ccc1ed 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 @@ -7,7 +7,6 @@ git apply $cvePatches/CVE-2015-8944/ANY/0001.patch git apply $cvePatches/CVE-2015-8955/ANY/0001.patch git apply $cvePatches/CVE-2016-0819/ANY/0001.patch git apply $cvePatches/CVE-2016-10208/3.10-^3.16/0001.patch -git apply $cvePatches/CVE-2016-1583/ANY/0001.patch git apply $cvePatches/CVE-2016-2475/ANY/0001.patch git apply $cvePatches/CVE-2016-8453/ANY/0001.patch git apply $cvePatches/CVE-2016-8464/3.10/0001.patch @@ -17,7 +16,6 @@ git apply $cvePatches/CVE-2016-9604/ANY/0001.patch git apply $cvePatches/CVE-2017-0449/ANY/0001.patch git apply $cvePatches/CVE-2017-0537/ANY/0001.patch git apply $cvePatches/CVE-2017-0750/ANY/0001.patch -git apply $cvePatches/CVE-2017-0794/ANY/0001.patch git apply $cvePatches/CVE-2017-1000365/3.10/0001.patch git apply $cvePatches/CVE-2017-1000380/^4.11/0001.patch git apply $cvePatches/CVE-2017-10996/ANY/0001.patch 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 06de4653..14901392 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 @@ -4,7 +4,6 @@ git apply $cvePatches/CVE-2014-1739/ANY/0001.patch git apply $cvePatches/CVE-2014-9715/^3.14/0002.patch git apply $cvePatches/CVE-2014-9781/ANY/0001.patch git apply $cvePatches/CVE-2015-1593/ANY/0001.patch -git apply $cvePatches/CVE-2016-1583/ANY/0001.patch git apply $cvePatches/CVE-2016-2443/ANY/0001.patch git apply $cvePatches/CVE-2016-8404/ANY/0001.patch git apply $cvePatches/CVE-2017-0610/ANY/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 5c1ea857..5d9b9e94 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 @@ -13,7 +13,6 @@ git apply $cvePatches/CVE-2016-10200/ANY/0001.patch git apply $cvePatches/CVE-2016-10208/3.10-^3.16/0001.patch git apply $cvePatches/CVE-2016-10230/ANY/0001.patch git apply $cvePatches/CVE-2016-10234/3.10/0001.patch -git apply $cvePatches/CVE-2016-1583/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 @@ -120,7 +119,6 @@ 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-7187/^4.10/0007.patch git apply $cvePatches/CVE-2017-7187/3.10/0004.patch git apply $cvePatches/CVE-2017-7308/ANY/0003.patch git apply $cvePatches/CVE-2017-7369/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 8929bef0..bf0202ce 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 @@ -11,7 +11,6 @@ git apply $cvePatches/CVE-2015-7550/^4.3/0001.patch git apply $cvePatches/CVE-2016-0805/ANY/0001.patch git apply $cvePatches/CVE-2016-0843/ANY/0001.patch git apply $cvePatches/CVE-2016-10208/3.10-^3.16/0001.patch -git apply $cvePatches/CVE-2016-1583/ANY/0001.patch 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 @@ -79,7 +78,6 @@ git apply $cvePatches/CVE-2017-6001/^4.9/0002.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/^4.10/0007.patch git apply $cvePatches/CVE-2017-7187/3.10/0004.patch git apply $cvePatches/CVE-2017-7472/ANY/0001.patch git apply $cvePatches/CVE-2017-7487/ANY/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 6c4de1f0..6fa24812 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 @@ -11,7 +11,6 @@ git apply $cvePatches/CVE-2015-7550/^4.3/0001.patch git apply $cvePatches/CVE-2016-0805/ANY/0001.patch git apply $cvePatches/CVE-2016-0843/ANY/0001.patch git apply $cvePatches/CVE-2016-10208/3.10-^3.16/0001.patch -git apply $cvePatches/CVE-2016-1583/ANY/0001.patch 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 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 9dee7d74..e73ab9d9 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 @@ -3,7 +3,6 @@ cd $base"kernel/lge/hammerhead" git apply $cvePatches/CVE-2014-9881/ANY/0001.patch git apply $cvePatches/CVE-2014-9882/ANY/0001.patch git apply $cvePatches/CVE-2015-1593/ANY/0001.patch -git apply $cvePatches/CVE-2016-1583/ANY/0001.patch git apply $cvePatches/CVE-2016-3894/ANY/0001.patch git apply $cvePatches/CVE-2016-5829/ANY/0001.patch git apply $cvePatches/CVE-2016-8650/ANY/0001.patch 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 6f59e1bb..8185ea42 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 @@ -1,7 +1,6 @@ #!/bin/bash cd $base"kernel/lge/mako" git apply $cvePatches/CVE-2013-4738/ANY/0002.patch -git apply $cvePatches/CVE-2016-1583/ANY/0001.patch git apply $cvePatches/CVE-2016-3857/ANY/0001.patch git apply $cvePatches/CVE-2016-3894/ANY/0001.patch git apply $cvePatches/CVE-2016-8402/3.4/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 453a37e4..7ee01a47 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 @@ -15,7 +15,6 @@ git apply $cvePatches/CVE-2015-8955/ANY/0001.patch git apply $cvePatches/CVE-2015-8967/ANY/0001.patch git apply $cvePatches/CVE-2016-0758/ANY/0001.patch git apply $cvePatches/CVE-2016-10208/3.10-^3.16/0001.patch -git apply $cvePatches/CVE-2016-1583/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 @@ -73,7 +72,6 @@ git apply $cvePatches/CVE-2017-5972/ANY/0002.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/^4.10/0007.patch git apply $cvePatches/CVE-2017-7187/3.10/0004.patch git apply $cvePatches/CVE-2017-7472/ANY/0001.patch git apply $cvePatches/CVE-2017-7487/ANY/0001.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 c027e102..7eea8cb1 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 @@ -7,7 +7,6 @@ git apply $cvePatches/CVE-2015-7515/^4.4/0002.patch git apply $cvePatches/CVE-2015-8950/ANY/0001.patch git apply $cvePatches/CVE-2015-8955/ANY/0001.patch git apply $cvePatches/CVE-2015-8967/ANY/0001.patch -git apply $cvePatches/CVE-2016-1583/ANY/0001.patch git apply $cvePatches/CVE-2016-3137/ANY/0001.patch git apply $cvePatches/CVE-2016-3857/ANY/0001.patch git apply $cvePatches/CVE-2016-3865/ANY/0001.patch @@ -30,7 +29,6 @@ git apply $cvePatches/CVE-2017-0457/3.10/0002.patch git apply $cvePatches/CVE-2017-0524/ANY/0001.patch git apply $cvePatches/CVE-2017-0648/ANY/0001.patch git apply $cvePatches/CVE-2017-0750/ANY/0001.patch -git apply $cvePatches/CVE-2017-0794/ANY/0001.patch git apply $cvePatches/CVE-2017-11024/ANY/0001.patch git apply $cvePatches/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatches/CVE-2017-15265/^4.14/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 2ebfbca5..e44d75d3 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 @@ -9,7 +9,6 @@ git apply $cvePatches/CVE-2016-0843/ANY/0001.patch git apply $cvePatches/CVE-2016-10200/ANY/0001.patch git apply $cvePatches/CVE-2016-10230/ANY/0001.patch git apply $cvePatches/CVE-2016-10232/3.10/0001.patch -git apply $cvePatches/CVE-2016-1583/ANY/0001.patch git apply $cvePatches/CVE-2016-2063/ANY/0001.patch git apply $cvePatches/CVE-2016-3070/ANY/0001.patch git apply $cvePatches/CVE-2016-3857/ANY/0001.patch @@ -61,7 +60,6 @@ git apply $cvePatches/CVE-2017-0746/ANY/0001.patch git apply $cvePatches/CVE-2017-0748/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-0794/ANY/0001.patch git apply $cvePatches/CVE-2017-1000365/3.10/0001.patch git apply $cvePatches/CVE-2017-1000380/^4.11/0001.patch git apply $cvePatches/CVE-2017-10997/3.10/0001.patch @@ -93,7 +91,6 @@ 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-7187/^4.10/0007.patch git apply $cvePatches/CVE-2017-7187/3.10/0004.patch git apply $cvePatches/CVE-2017-7308/ANY/0003.patch git apply $cvePatches/CVE-2017-7369/3.10/0001.patch 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 130e545d..566d4662 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 @@ -1,7 +1,6 @@ #!/bin/bash cd $base"kernel/nextbit/msm8992" git apply $cvePatches/CVE-2014-9904/ANY/0001.patch -git apply $cvePatches/CVE-2016-1583/ANY/0001.patch 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 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 78699f4c..2d353458 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 @@ -3,7 +3,6 @@ cd $base"kernel/oneplus/msm8974" git apply $cvePatches/CVE-2014-9781/ANY/0001.patch git apply $cvePatches/CVE-2014-9880/ANY/0001.patch git apply $cvePatches/CVE-2016-0801/ANY/0001.patch -git apply $cvePatches/CVE-2016-1583/ANY/0001.patch git apply $cvePatches/CVE-2016-2443/ANY/0001.patch git apply $cvePatches/CVE-2016-6672/ANY/0001.patch git apply $cvePatches/CVE-2016-8404/ANY/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 0439197e..1eacb965 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 @@ -2,7 +2,6 @@ cd $base"kernel/samsung/jf" git apply $cvePatches/CVE-2016-0801/ANY/0001.patch git apply $cvePatches/CVE-2016-10233/ANY/0001.patch -git apply $cvePatches/CVE-2016-1583/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-2475/ANY/0001.patch 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 32a3a532..034ec9a1 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 @@ -1,6 +1,5 @@ #!/bin/bash cd $base"kernel/samsung/msm8974" -git apply $cvePatches/CVE-2016-1583/ANY/0001.patch git apply $cvePatches/CVE-2016-2475/ANY/0001.patch git apply $cvePatches/CVE-2016-4578/ANY/0001.patch git apply $cvePatches/CVE-2017-0611/3.4/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 70082444..47d9dff2 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 @@ -34,7 +34,6 @@ git apply $cvePatches/CVE-2017-16USB/ANY/0005.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-7187/^4.10/0007.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 3dfb260d..8bc6473d 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 @@ -85,7 +85,6 @@ git apply $cvePatches/CVE-2017-6345/^4.9/0001.patch git apply $cvePatches/CVE-2017-6346/3.18/0001.patch git apply $cvePatches/CVE-2017-6348/^4.9/0001.patch git apply $cvePatches/CVE-2017-6353/^4.10/0001.patch -git apply $cvePatches/CVE-2017-7187/^4.10/0007.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