From b84f0881b05973b801ac4938d12a2230a55e9a32 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 8 Nov 2017 13:13:06 -0500 Subject: [PATCH] Version the previous USB patches --- .../CVE-2017-16525/{ANY => ^4.13}/0001.patch | 0 .../CVE-2017-16525/{ANY => ^4.13}/0002.patch | 0 .../CVE-2017-16526/{ANY => ^4.13}/0001.patch | 0 .../CVE-2017-16527/{ANY => ^4.13}/0001.patch | 0 .../CVE-2017-16528/{ANY => ^4.13}/0001.patch | 0 .../CVE-2017-16529/{ANY => ^4.13}/0001.patch | 0 .../CVE-2017-16530/{ANY => ^4.13}/0001.patch | 0 .../CVE-2017-16531/{ANY => ^4.13}/0001.patch | 0 .../CVE-2017-16532/{ANY => ^4.13}/0001.patch | 0 .../CVE-2017-16533/{ANY => ^4.13}/0001.patch | 0 .../CVE-2017-16534/{ANY => ^4.13}/0001.patch | 0 .../CVE-2017-16535/{ANY => ^4.13}/0001.patch | 0 .../CVE-2017-16538/{ANY => ^4.13}/0001.patch | 0 .../CVE-2017-16538/{ANY => ^4.13}/0002.patch | 0 .../CVE-2017-16643/{ANY => 3.5+}/0001.patch | 0 Patches/Linux_CVEs/Kernel_CVE_Patch_List.txt | 34 +++++++++---------- .../android_kernel_lge_hammerhead.sh | 2 -- .../android_kernel_oneplus_msm8974.sh | 1 - 18 files changed, 17 insertions(+), 20 deletions(-) rename Patches/Linux_CVEs/CVE-2017-16525/{ANY => ^4.13}/0001.patch (100%) rename Patches/Linux_CVEs/CVE-2017-16525/{ANY => ^4.13}/0002.patch (100%) rename Patches/Linux_CVEs/CVE-2017-16526/{ANY => ^4.13}/0001.patch (100%) rename Patches/Linux_CVEs/CVE-2017-16527/{ANY => ^4.13}/0001.patch (100%) rename Patches/Linux_CVEs/CVE-2017-16528/{ANY => ^4.13}/0001.patch (100%) rename Patches/Linux_CVEs/CVE-2017-16529/{ANY => ^4.13}/0001.patch (100%) rename Patches/Linux_CVEs/CVE-2017-16530/{ANY => ^4.13}/0001.patch (100%) rename Patches/Linux_CVEs/CVE-2017-16531/{ANY => ^4.13}/0001.patch (100%) rename Patches/Linux_CVEs/CVE-2017-16532/{ANY => ^4.13}/0001.patch (100%) rename Patches/Linux_CVEs/CVE-2017-16533/{ANY => ^4.13}/0001.patch (100%) rename Patches/Linux_CVEs/CVE-2017-16534/{ANY => ^4.13}/0001.patch (100%) rename Patches/Linux_CVEs/CVE-2017-16535/{ANY => ^4.13}/0001.patch (100%) rename Patches/Linux_CVEs/CVE-2017-16538/{ANY => ^4.13}/0001.patch (100%) rename Patches/Linux_CVEs/CVE-2017-16538/{ANY => ^4.13}/0002.patch (100%) rename Patches/Linux_CVEs/CVE-2017-16643/{ANY => 3.5+}/0001.patch (100%) diff --git a/Patches/Linux_CVEs/CVE-2017-16525/ANY/0001.patch b/Patches/Linux_CVEs/CVE-2017-16525/^4.13/0001.patch similarity index 100% rename from Patches/Linux_CVEs/CVE-2017-16525/ANY/0001.patch rename to Patches/Linux_CVEs/CVE-2017-16525/^4.13/0001.patch diff --git a/Patches/Linux_CVEs/CVE-2017-16525/ANY/0002.patch b/Patches/Linux_CVEs/CVE-2017-16525/^4.13/0002.patch similarity index 100% rename from Patches/Linux_CVEs/CVE-2017-16525/ANY/0002.patch rename to Patches/Linux_CVEs/CVE-2017-16525/^4.13/0002.patch diff --git a/Patches/Linux_CVEs/CVE-2017-16526/ANY/0001.patch b/Patches/Linux_CVEs/CVE-2017-16526/^4.13/0001.patch similarity index 100% rename from Patches/Linux_CVEs/CVE-2017-16526/ANY/0001.patch rename to Patches/Linux_CVEs/CVE-2017-16526/^4.13/0001.patch diff --git a/Patches/Linux_CVEs/CVE-2017-16527/ANY/0001.patch b/Patches/Linux_CVEs/CVE-2017-16527/^4.13/0001.patch similarity index 100% rename from Patches/Linux_CVEs/CVE-2017-16527/ANY/0001.patch rename to Patches/Linux_CVEs/CVE-2017-16527/^4.13/0001.patch diff --git a/Patches/Linux_CVEs/CVE-2017-16528/ANY/0001.patch b/Patches/Linux_CVEs/CVE-2017-16528/^4.13/0001.patch similarity index 100% rename from Patches/Linux_CVEs/CVE-2017-16528/ANY/0001.patch rename to Patches/Linux_CVEs/CVE-2017-16528/^4.13/0001.patch diff --git a/Patches/Linux_CVEs/CVE-2017-16529/ANY/0001.patch b/Patches/Linux_CVEs/CVE-2017-16529/^4.13/0001.patch similarity index 100% rename from Patches/Linux_CVEs/CVE-2017-16529/ANY/0001.patch rename to Patches/Linux_CVEs/CVE-2017-16529/^4.13/0001.patch diff --git a/Patches/Linux_CVEs/CVE-2017-16530/ANY/0001.patch b/Patches/Linux_CVEs/CVE-2017-16530/^4.13/0001.patch similarity index 100% rename from Patches/Linux_CVEs/CVE-2017-16530/ANY/0001.patch rename to Patches/Linux_CVEs/CVE-2017-16530/^4.13/0001.patch diff --git a/Patches/Linux_CVEs/CVE-2017-16531/ANY/0001.patch b/Patches/Linux_CVEs/CVE-2017-16531/^4.13/0001.patch similarity index 100% rename from Patches/Linux_CVEs/CVE-2017-16531/ANY/0001.patch rename to Patches/Linux_CVEs/CVE-2017-16531/^4.13/0001.patch diff --git a/Patches/Linux_CVEs/CVE-2017-16532/ANY/0001.patch b/Patches/Linux_CVEs/CVE-2017-16532/^4.13/0001.patch similarity index 100% rename from Patches/Linux_CVEs/CVE-2017-16532/ANY/0001.patch rename to Patches/Linux_CVEs/CVE-2017-16532/^4.13/0001.patch diff --git a/Patches/Linux_CVEs/CVE-2017-16533/ANY/0001.patch b/Patches/Linux_CVEs/CVE-2017-16533/^4.13/0001.patch similarity index 100% rename from Patches/Linux_CVEs/CVE-2017-16533/ANY/0001.patch rename to Patches/Linux_CVEs/CVE-2017-16533/^4.13/0001.patch diff --git a/Patches/Linux_CVEs/CVE-2017-16534/ANY/0001.patch b/Patches/Linux_CVEs/CVE-2017-16534/^4.13/0001.patch similarity index 100% rename from Patches/Linux_CVEs/CVE-2017-16534/ANY/0001.patch rename to Patches/Linux_CVEs/CVE-2017-16534/^4.13/0001.patch diff --git a/Patches/Linux_CVEs/CVE-2017-16535/ANY/0001.patch b/Patches/Linux_CVEs/CVE-2017-16535/^4.13/0001.patch similarity index 100% rename from Patches/Linux_CVEs/CVE-2017-16535/ANY/0001.patch rename to Patches/Linux_CVEs/CVE-2017-16535/^4.13/0001.patch diff --git a/Patches/Linux_CVEs/CVE-2017-16538/ANY/0001.patch b/Patches/Linux_CVEs/CVE-2017-16538/^4.13/0001.patch similarity index 100% rename from Patches/Linux_CVEs/CVE-2017-16538/ANY/0001.patch rename to Patches/Linux_CVEs/CVE-2017-16538/^4.13/0001.patch diff --git a/Patches/Linux_CVEs/CVE-2017-16538/ANY/0002.patch b/Patches/Linux_CVEs/CVE-2017-16538/^4.13/0002.patch similarity index 100% rename from Patches/Linux_CVEs/CVE-2017-16538/ANY/0002.patch rename to Patches/Linux_CVEs/CVE-2017-16538/^4.13/0002.patch diff --git a/Patches/Linux_CVEs/CVE-2017-16643/ANY/0001.patch b/Patches/Linux_CVEs/CVE-2017-16643/3.5+/0001.patch similarity index 100% rename from Patches/Linux_CVEs/CVE-2017-16643/ANY/0001.patch rename to Patches/Linux_CVEs/CVE-2017-16643/3.5+/0001.patch diff --git a/Patches/Linux_CVEs/Kernel_CVE_Patch_List.txt b/Patches/Linux_CVEs/Kernel_CVE_Patch_List.txt index 03deb3f8..71c31444 100644 --- a/Patches/Linux_CVEs/Kernel_CVE_Patch_List.txt +++ b/Patches/Linux_CVEs/Kernel_CVE_Patch_List.txt @@ -1829,37 +1829,37 @@ CVE-2017-9725 Link - 3.10 - https://source.codeaurora.org/quic/la/kernel/msm-3.10/commit/?id=5479a3c164c8762b5bf91c5fae452882366adb6a Link - 4.4 - https://source.codeaurora.org/quic/la/kernel/msm-4.4/commit/?h=aosp/android-4.4&id=1f8f9b566e8446c13b954220c226c58d22076f88 CVE-2017-16525 - Link - https://github.com/torvalds/linux/commit/bd998c2e0df0469707503023d50d46cf0b10c787 - Link - https://github.com/torvalds/linux/commit/299d7572e46f98534033a9e65973f13ad1ce9047 + Link - ^4.13 - https://github.com/torvalds/linux/commit/bd998c2e0df0469707503023d50d46cf0b10c787 + Link - ^4.13 - https://github.com/torvalds/linux/commit/299d7572e46f98534033a9e65973f13ad1ce9047 CVE-2017-16526 - Link - https://github.com/torvalds/linux/commit/bbf26183b7a6236ba602f4d6a2f7cade35bba043 + Link - ^4.13 - https://github.com/torvalds/linux/commit/bbf26183b7a6236ba602f4d6a2f7cade35bba043 CVE-2017-16527 - Link - https://github.com/torvalds/linux/commit/124751d5e63c823092060074bd0abaae61aaa9c4 + Link - ^4.13 - https://github.com/torvalds/linux/commit/124751d5e63c823092060074bd0abaae61aaa9c4 CVE-2017-16528 - Link - https://github.com/torvalds/linux/commit/fc27fe7e8deef2f37cba3f2be2d52b6ca5eb9d57 + Link - ^4.13 - https://github.com/torvalds/linux/commit/fc27fe7e8deef2f37cba3f2be2d52b6ca5eb9d57 CVE-2017-16529 - Link - https://github.com/torvalds/linux/commit/bfc81a8bc18e3c4ba0cbaa7666ff76be2f998991 + Link - ^4.13 - https://github.com/torvalds/linux/commit/bfc81a8bc18e3c4ba0cbaa7666ff76be2f998991 CVE-2017-16530 - Link - https://github.com/torvalds/linux/commit/786de92b3cb26012d3d0f00ee37adf14527f35c4 + Link - ^4.13 - https://github.com/torvalds/linux/commit/786de92b3cb26012d3d0f00ee37adf14527f35c4 CVE-2017-16531 - Link - https://github.com/torvalds/linux/commit/bd7a3fe770ebd8391d1c7d072ff88e9e76d063eb + Link - ^4.13 - https://github.com/torvalds/linux/commit/bd7a3fe770ebd8391d1c7d072ff88e9e76d063eb CVE-2017-16532 - Link - https://github.com/torvalds/linux/commit/7c80f9e4a588f1925b07134bb2e3689335f6c6d8 + Link - ^4.13 - https://github.com/torvalds/linux/commit/7c80f9e4a588f1925b07134bb2e3689335f6c6d8 CVE-2017-16533 - Link - https://github.com/torvalds/linux/commit/f043bfc98c193c284e2cd768fefabe18ac2fed9b + Link - ^4.13 - https://github.com/torvalds/linux/commit/f043bfc98c193c284e2cd768fefabe18ac2fed9b CVE-2017-16534 - Link - https://github.com/torvalds/linux/commit/2e1c42391ff2556387b3cb6308b24f6f65619feb + Link - ^4.13 - https://github.com/torvalds/linux/commit/2e1c42391ff2556387b3cb6308b24f6f65619feb CVE-2017-16535 - Link - https://github.com/torvalds/linux/commit/1c0edc3633b56000e18d82fc241e3995ca18a69e + Link - ^4.13 - https://github.com/torvalds/linux/commit/1c0edc3633b56000e18d82fc241e3995ca18a69e CVE-2017-16536 - Link - https://patchwork.kernel.org/patch/9963527/ + Link - ^4.13 - https://patchwork.kernel.org/patch/9963527/ CVE-2017-16537 - Link - https://patchwork.kernel.org/patch/9994017/ + Link - ^4.13 - https://patchwork.kernel.org/patch/9994017/ CVE-2017-16538 - Link - https://patchwork.linuxtv.org/patch/44566/ - Link - https://patchwork.linuxtv.org/patch/44567/ + Link - ^4.13 - https://patchwork.linuxtv.org/patch/44566/ + Link - ^4.13 - https://patchwork.linuxtv.org/patch/44567/ CVE-2017-16643 - Link - https://github.com/torvalds/linux/commit/a50829479f58416a013a4ccca791336af3c584c7 + Link - 3.5+ - https://github.com/torvalds/linux/commit/a50829479f58416a013a4ccca791336af3c584c7 CVE-2017-16644 Link - https://patchwork.kernel.org/patch/9966135/ CVE-2017-16645 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 24e79cbd..537e63a5 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 @@ -4,7 +4,6 @@ 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-3894/ANY/0001.patch -git apply $cvePatches/CVE-2016-5829/ANY/0001.patch git apply $cvePatches/CVE-2016-8650/ANY/0001.patch git apply $cvePatches/CVE-2016-9576/3.4/0001.patch git apply $cvePatches/CVE-2016-9604/ANY/0001.patch @@ -28,7 +27,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/3.4/0001.patch git apply $cvePatches/CVE-2017-7308/ANY/0003.patch git apply $cvePatches/CVE-2017-7487/ANY/0001.patch git apply $cvePatches/CVE-2017-8246/3.4/0002.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 3393e96d..7ff12e36 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 @@ -26,7 +26,6 @@ git apply $cvePatches/CVE-2017-16526/ANY/0001.patch git apply $cvePatches/CVE-2017-16532/ANY/0001.patch git apply $cvePatches/CVE-2017-16533/ANY/0001.patch git apply $cvePatches/CVE-2017-16535/ANY/0001.patch -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