From cf019edef9ffc2e1221ca7db619e71a58c3575ff Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 13 Aug 2022 18:54:50 -0400 Subject: [PATCH] Fixes Signed-off-by: Tad --- Scripts/Common/Fix_CVE_Patchers.sh | 2 +- .../CVE_Patchers/android_kernel_amazon_hdx-common.sh | 2 +- Scripts/LineageOS-15.1/Patch.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index d5737066..15484924 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -35,7 +35,7 @@ commentPatches() { # 0006-AndroidHardening-Kernel_Hardening/3.10/0009.patch # CVE-2017-13218/4.4/0025.patch -commentPatches android_kernel_amazon_hdx-common.sh "CVE-2021-Misc2/3.4/0055.patch" "CVE-2021-Misc2/3.4/0056.patch"; +commentPatches android_kernel_amazon_hdx-common.sh "CVE-2019-14070/3.4/0008.patch" "CVE-2021-Misc2/3.4/0055.patch" "CVE-2021-Misc2/3.4/0056.patch"; commentPatches android_kernel_asus_fugu.sh "CVE-2014-2568" "CVE-2014-8559" "CVE-2015-8746" "CVE-2017-5551" "LVT-2017-0003/3.10/0001.patch"; commentPatches android_kernel_asus_grouper.sh "CVE-2017-15868" "CVE-2021-Misc2/3.4/0055.patch" "CVE-2021-Misc2/3.4/0056.patch"; commentPatches android_kernel_asus_msm8916.sh "CVE-2018-13913/ANY/0001.patch"; 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 85044057..71c9d0d6 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 @@ -624,7 +624,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14037/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/3.4/0008.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14821/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14835/3.18/0003.patch diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 40c0a236..fbf2d122 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -119,8 +119,8 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/332757.patch"; #P_asb_2022-06 l applyPatch "$DOS_PATCHES/android_frameworks_base/332776.patch"; #P_asb_2022-06 Update GeofenceHardwareRequestParcelable to match parcel/unparcel format. applyPatch "$DOS_PATCHES/android_frameworks_base/332778.patch"; #P_asb_2022-06 Fix security hole in GateKeeperResponse applyPatch "$DOS_PATCHES/android_frameworks_base/332779.patch"; #P_asb_2022-06 Prevent non-admin users from deleting system apps. -applyPatch "$DOS_PATCHES/android_frameworks_base/334257-backport.patch"; #P_asb_2022-07 UserDataPreparer: reboot to recovery if preparing user storage fails -applyPatch "$DOS_PATCHES/android_frameworks_base/334258-backport.patch"; #P_asb_2022-07 UserDataPreparer: reboot to recovery for system user only +#applyPatch "$DOS_PATCHES/android_frameworks_base/334257-backport.patch"; #P_asb_2022-07 UserDataPreparer: reboot to recovery if preparing user storage fails #XXX +#applyPatch "$DOS_PATCHES/android_frameworks_base/334258-backport.patch"; #P_asb_2022-07 UserDataPreparer: reboot to recovery for system user only #XXX applyPatch "$DOS_PATCHES/android_frameworks_base/334262.patch"; #P_asb_2022-07 Crash invalid FGS notifications applyPatch "$DOS_PATCHES/android_frameworks_base/335117-backport.patch"; #P_asb_2022-08 Only allow system and same app to apply relinquishTaskIdentity #applyPatch "$DOS_PATCHES/android_frameworks_base/335119.patch"; #P_asb_2022-08 Remove package title from notification access confirmation intent TODO: 335116 must be backported