From 1c49b80da04d37131c5ff7ae99806f1382ceddfd Mon Sep 17 00:00:00 2001 From: Tad Date: Mon, 1 Apr 2019 18:57:04 -0400 Subject: [PATCH] Minor tweaks - CVE patchers were updated with no change - hardenDefconfig: disable MSM_SMP2P_TEST to mitigate CVE-2019-2247 - 14.1 add a cherry pick --- Patches/Linux | 2 +- Scripts/Common/Functions.sh | 2 +- Scripts/LineageOS-14.1/Functions.sh | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 3f4be208..b630aceb 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 3f4be208ff3ef2bad6cd8bf9bf544e9dec59096a +Subproject commit b630aceb26b6bec59f60b5f92188af39b6e311a2 diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index d8b633c0..20c6ebdb 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -397,7 +397,7 @@ hardenDefconfig() { fi; done #Disable supported options - declare -a optionsNo=("CONFIG_ACPI_CUSTOM_METHOD" "CONFIG_BINFMT_MISC" "CONFIG_COMPAT_BRK" "CONFIG_COMPAT_VDSO" "CONFIG_CP_ACCESS64" "CONFIG_DEVKMEM" "CONFIG_DEVMEM" "CONFIG_DEVPORT" "CONFIG_HIBERNATION" "CONFIG_INET_DIAG" "CONFIG_KEXEC" "CONFIG_LEGACY_PTYS" "CONFIG_MSM_BUSPM_DEV" "CONFIG_OABI_COMPAT" "CONFIG_PROC_KCORE" "CONFIG_PROC_VMCORE" "CONFIG_SECURITY_SELINUX_DISABLE" "CONFIG_SLAB_MERGE_DEFAULT" "CONFIG_WLAN_FEATURE_MEMDUMP" "CONFIG_EARJACK_DEBUGGER" "CONFIG_IOMMU_NON_SECURE"); + declare -a optionsNo=("CONFIG_ACPI_CUSTOM_METHOD" "CONFIG_BINFMT_MISC" "CONFIG_COMPAT_BRK" "CONFIG_COMPAT_VDSO" "CONFIG_CP_ACCESS64" "CONFIG_DEVKMEM" "CONFIG_DEVMEM" "CONFIG_DEVPORT" "CONFIG_HIBERNATION" "CONFIG_INET_DIAG" "CONFIG_KEXEC" "CONFIG_LEGACY_PTYS" "CONFIG_MSM_BUSPM_DEV" "CONFIG_OABI_COMPAT" "CONFIG_PROC_KCORE" "CONFIG_PROC_VMCORE" "CONFIG_SECURITY_SELINUX_DISABLE" "CONFIG_SLAB_MERGE_DEFAULT" "CONFIG_WLAN_FEATURE_MEMDUMP" "CONFIG_EARJACK_DEBUGGER" "CONFIG_IOMMU_NON_SECURE" "CONFIG_MSM_SMP2P_TEST"); if [[ "$1" != *"kernel/htc/msm8994"* ]] && [[ "$1" != *"kernel/samsung/smdk4412"* ]] && [[ "$1" != *"kernel/htc/flounder"* ]] && [[ "$1" != *"kernel/amazon/hdx-common"* ]]; then optionsNo+=("CONFIG_DIAG_CHAR" "CONFIG_DIAG_OVER_USB" "CONFIG_USB_QCOM_DIAG_BRIDGE" "CONFIG_DIAGFWD_BRIDGE_CODE" "CONFIG_DIAG_SDIO_PIPE" "CONFIG_DIAG_HSIC_PIPE"); fi; diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 650b0e60..0a8420ea 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -101,6 +101,7 @@ patchWorkspace() { source build/envsetup.sh; repopick -it n_asb_09-2018-qcom; #repopick -it bt-sbc-hd-dualchannel-nougat; + repopick 201113; #wifi country code fix repopick 244387 244388; #loopback fixes source "$DOS_SCRIPTS/Patch.sh";