From eb32600c0bca70b784a32afec5b094d4a748fd4d Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 3 Jan 2018 12:15:58 -0500 Subject: [PATCH] Fix AES256 encryption patch, and update CVE patchers --- .../android_system_vold/0001-AES256.patch | 26 +++++++++++++++---- Patches/Linux | 2 +- .../android_kernel_amazon_hdx-common.sh | 2 ++ .../android_kernel_asus_msm8916.sh | 1 + .../android_kernel_fairphone_msm8974.sh | 2 ++ .../android_kernel_google_marlin.sh | 4 +++ .../CVE_Patchers/android_kernel_google_msm.sh | 2 ++ .../android_kernel_htc_flounder.sh | 1 + .../android_kernel_htc_msm8974.sh | 2 ++ .../android_kernel_htc_msm8994.sh | 2 ++ .../android_kernel_huawei_angler.sh | 2 ++ .../android_kernel_lge_bullhead.sh | 2 ++ .../CVE_Patchers/android_kernel_lge_g3.sh | 2 ++ .../android_kernel_lge_hammerhead.sh | 2 ++ .../CVE_Patchers/android_kernel_lge_mako.sh | 2 ++ .../android_kernel_lge_msm8974.sh | 2 ++ .../android_kernel_lge_msm8992.sh | 2 ++ .../android_kernel_lge_msm8996.sh | 2 ++ .../CVE_Patchers/android_kernel_moto_shamu.sh | 2 ++ .../android_kernel_motorola_msm8916.sh | 3 +++ .../android_kernel_motorola_msm8992.sh | 2 ++ .../android_kernel_nextbit_msm8992.sh | 1 + .../android_kernel_oneplus_msm8974.sh | 2 ++ .../CVE_Patchers/android_kernel_samsung_jf.sh | 2 ++ .../android_kernel_samsung_msm8974.sh | 2 ++ .../android_kernel_samsung_smdk4412.sh | 2 ++ .../android_kernel_samsung_universal8890.sh | 4 ++- Scripts/LineageOS-14.1/Functions.sh | 2 +- 28 files changed, 74 insertions(+), 8 deletions(-) diff --git a/Patches/LineageOS-14.1/android_system_vold/0001-AES256.patch b/Patches/LineageOS-14.1/android_system_vold/0001-AES256.patch index 18fe5b03..5268fa97 100644 --- a/Patches/LineageOS-14.1/android_system_vold/0001-AES256.patch +++ b/Patches/LineageOS-14.1/android_system_vold/0001-AES256.patch @@ -1,13 +1,29 @@ -From af22f14223092a5403bc33608260f355b57284f3 Mon Sep 17 00:00:00 2001 +From 2206aff4757e0f1094861f0e9505d1b5ddbf3236 Mon Sep 17 00:00:00 2001 From: Tad -Date: Mon, 1 Jan 2018 09:50:29 -0500 +Date: Wed, 3 Jan 2018 11:55:06 -0500 Subject: [PATCH] Build time variable for AES-256 encryption -Change-Id: Id08b5a18c5b4d4ec1f3f67a8e5eab93f5b967060 +Change-Id: Ib2d53a1d22e935ef0fa5f0f91e3bf5308d9c6459 --- - cryptfs.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) + Android.mk | 4 ++++ + cryptfs.c | 11 +++++++++-- + 2 files changed, 13 insertions(+), 2 deletions(-) +diff --git a/Android.mk b/Android.mk +index e645574..7112dce 100644 +--- a/Android.mk ++++ b/Android.mk +@@ -115,6 +115,10 @@ LOCAL_C_INCLUDES += $(TARGET_CRYPTFS_HW_PATH) + LOCAL_CFLAGS += -DCONFIG_HW_DISK_ENCRYPTION + endif + ++ifeq ($(TARGET_WANTS_STRONG_ENCRYPTION),true) ++LOCAL_CFLAGS += -DCONFIG_STRONG_ENCRYPTION ++endif ++ + include $(BUILD_STATIC_LIBRARY) + + include $(CLEAR_VARS) diff --git a/cryptfs.c b/cryptfs.c index b25510f..86ffac3 100644 --- a/cryptfs.c diff --git a/Patches/Linux b/Patches/Linux index 8c1713d4..a815f2aa 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 8c1713d448643b089044034e130472579c424e19 +Subproject commit a815f2aa1c5f0d18981412b01feb21957c737867 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 5c560d53..1e109511 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 @@ -48,12 +48,14 @@ git apply $cvePatchesLinux/CVE-2017-1000380/^4.11/0001.patch git apply $cvePatchesLinux/CVE-2017-11000/ANY/0002.patch git apply $cvePatchesLinux/CVE-2017-11059/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatchesLinux/CVE-2017-13080/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0002.patch git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0003.patch git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0004.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/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 9bc03aa5..ba47f9e1 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 @@ -24,6 +24,7 @@ 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-11033/3.10/0002.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 git apply $cvePatchesLinux/CVE-2017-13168/3.10/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 8d84e772..ee15d810 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 @@ -8,12 +8,14 @@ git apply $cvePatchesLinux/CVE-2016-7117/^4.5/0002.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0786/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11059/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatchesLinux/CVE-2017-13080/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0002.patch git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0003.patch git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0004.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch git apply $cvePatchesLinux/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 02692b0c..8bd95ded 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 @@ -114,9 +114,13 @@ git apply $cvePatchesLinux/CVE-2017-11089/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11091/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-11093/3.18/0001.patch +git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-12146/3.16+/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-14873/3.18/0001.patch git apply $cvePatchesLinux/CVE-2017-14897/3.18/0002.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch +git apply $cvePatchesLinux/CVE-2017-15847/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.18/0003.patch git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/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 878bb44c..9ad7decd 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 @@ -18,12 +18,14 @@ git apply $cvePatchesLinux/CVE-2017-0786/ANY/0001.patch #git apply $cvePatchesLinux/CVE-2017-11015/prima/0002.patch git apply $cvePatchesLinux/CVE-2017-11089/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatchesLinux/CVE-2017-13080/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0002.patch git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0003.patch git apply $cvePatchesLinux/CVE-2017-13080-Extra/ANY/0004.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch 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 9a8811be..d8158fe5 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 @@ -37,6 +37,7 @@ git apply $cvePatchesLinux/CVE-2017-11089/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatchesLinux/CVE-2017-13168/3.10/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0002.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 bce58c0d..29c930ea 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 @@ -9,7 +9,9 @@ git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0786/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch git apply $cvePatchesLinux/CVE-2017-16526/^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 913eed5b..7ed74ba0 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 @@ -54,6 +54,7 @@ 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-11033/3.10/0002.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-12153/3.2-^3.16/0001.patch git apply $cvePatchesLinux/CVE-2017-13166/3.10/0001.patch @@ -64,6 +65,7 @@ git apply $cvePatchesLinux/CVE-2017-13167/3.10/0006.patch git apply $cvePatchesLinux/CVE-2017-13167/3.10/0007.patch git apply $cvePatchesLinux/CVE-2017-13167/3.10/0008.patch git apply $cvePatchesLinux/CVE-2017-13168/3.10/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0002.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 7c8dae3d..1c786d32 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 @@ -80,6 +80,7 @@ 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 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 git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatchesLinux/CVE-2017-13163/3.10/0001.patch @@ -92,6 +93,7 @@ git apply $cvePatchesLinux/CVE-2017-13167/3.10/0007.patch git apply $cvePatchesLinux/CVE-2017-13167/3.10/0008.patch git apply $cvePatchesLinux/CVE-2017-13168/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-13174/3.10/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-14897/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/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 2b4f52cb..6e406b77 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 @@ -74,6 +74,7 @@ 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 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 git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatchesLinux/CVE-2017-13163/3.10/0001.patch @@ -85,6 +86,7 @@ git apply $cvePatchesLinux/CVE-2017-13167/3.10/0006.patch git apply $cvePatchesLinux/CVE-2017-13167/3.10/0007.patch git apply $cvePatchesLinux/CVE-2017-13167/3.10/0008.patch git apply $cvePatchesLinux/CVE-2017-13168/3.10/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-14897/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-14903/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch 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 bd29a02e..f87d33d2 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 @@ -12,6 +12,8 @@ git apply $cvePatchesLinux/CVE-2017-0611/3.4/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0786/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/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 c2e00cdc..e9cf8d36 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 @@ -15,7 +15,9 @@ git apply $cvePatchesLinux/CVE-2017-0751/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0786/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11089/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16533/^4.13/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 7456da64..1f6b217e 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 @@ -4,6 +4,8 @@ git apply $cvePatchesLinux/CVE-2013-4738/ANY/0002.patch git apply $cvePatchesLinux/CVE-2016-3857/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-3894/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-9793/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16533/^4.13/0001.patch 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 27009634..ce31934f 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 @@ -9,6 +9,8 @@ git apply $cvePatchesLinux/CVE-2016-0806/prima/0010.patch git apply $cvePatchesLinux/CVE-2016-6751/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-11473/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch 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 fdcffa38..4ea12b20 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 @@ -77,6 +77,7 @@ git apply $cvePatchesLinux/CVE-2017-11085/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-11089/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11092/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-12153/3.2-^3.16/0001.patch git apply $cvePatchesLinux/CVE-2017-13166/3.10/0001.patch @@ -87,6 +88,7 @@ git apply $cvePatchesLinux/CVE-2017-13167/3.10/0006.patch git apply $cvePatchesLinux/CVE-2017-13167/3.10/0007.patch git apply $cvePatchesLinux/CVE-2017-13167/3.10/0008.patch git apply $cvePatchesLinux/CVE-2017-13168/3.10/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-14897/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0001.patch 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 fcdf2b4a..b480d67c 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 @@ -62,7 +62,9 @@ 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-11031/ANY/0002.patch +git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-12146/3.16+/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.18/0003.patch git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/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 0ff34faa..052dad18 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 @@ -67,8 +67,10 @@ 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-11024/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-12153/3.2-^3.16/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16531/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/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 84d2bf5c..f42085e5 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 @@ -49,7 +49,10 @@ git apply $cvePatchesLinux/CVE-2017-11024/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11085/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-11089/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11092/3.10/0002.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-13215/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-15845/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16537/^4.13/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 1c1d1e41..865b460f 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 @@ -101,10 +101,12 @@ git apply $cvePatchesLinux/CVE-2017-11085/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-11089/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11092/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-12153/3.2-^3.16/0001.patch git apply $cvePatchesLinux/CVE-2017-13163/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-13168/3.10/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.10/0002.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 1d2851ee..443c9f4c 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-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11600/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-13163/3.10/0001.patch git apply $cvePatchesLinux/CVE-2017-13168/3.10/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 643fd758..dc2ba747 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 @@ -21,8 +21,10 @@ git apply $cvePatchesLinux/CVE-2017-11000/ANY/0002.patch git apply $cvePatchesLinux/CVE-2017-11019/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11059/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch git apply $cvePatchesLinux/CVE-2017-13080/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/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 0f6d272a..6d9d08fe 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 @@ -30,7 +30,9 @@ git apply $cvePatchesLinux/CVE-2017-11015/prima/0001.patch git apply $cvePatchesLinux/CVE-2017-11015/prima/0002.patch git apply $cvePatchesLinux/CVE-2017-11089/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-12153/3.2-^3.16/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/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 1d12e1c2..27e9405c 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 @@ -5,6 +5,8 @@ git apply $cvePatchesLinux/CVE-2016-2475/ANY/0001.patch git apply $cvePatchesLinux/CVE-2016-4578/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0611/3.4/0001.patch git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/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 08aaeafd..cd67f1c4 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 @@ -26,6 +26,8 @@ git apply $cvePatchesLinux/CVE-2017-0706/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-0786/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-1000380/^4.11/0001.patch git apply $cvePatchesLinux/CVE-2017-11090/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15265/^4.14/0001.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch git apply $cvePatchesLinux/CVE-2017-16532/^4.13/0001.patch 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 c346568b..5407bf85 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 @@ -14,7 +14,7 @@ git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0033.patch git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0034.patch git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0035.patch git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0036.patch -git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0038.patch +#git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0038.patch git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0041.patch git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0043.patch git apply $cvePatchesLinux/0002-Copperhead-Kernel_Hardening/3.18/0045.patch @@ -84,6 +84,8 @@ git apply $cvePatchesLinux/CVE-2017-1000380/^4.11/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 +git apply $cvePatchesLinux/CVE-2017-11473/ANY/0001.patch +git apply $cvePatchesLinux/CVE-2017-13215/ANY/0001.patch git apply $cvePatchesLinux/CVE-2017-15868/3.18/0003.patch git apply $cvePatchesLinux/CVE-2017-16525/^4.13/0002.patch git apply $cvePatchesLinux/CVE-2017-16526/^4.13/0001.patch diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 619bc5dd..25ef942b 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -96,7 +96,7 @@ export -f enableForcedEncryption; enableStrongEncryption() { cd $base$1; - echo "CONFIG_STRONG_ENCRYPTION := true" >> BoardConfig.mk; + echo "TARGET_WANTS_STRONG_ENCRYPTION := true" >> BoardConfig.mk; echo "Enabled AES-256 encryption for $1"; cd $base; }