mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-01-25 23:05:56 -05:00
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
This commit is contained in:
parent
7223df543a
commit
1c49b80da0
@ -1 +1 @@
|
|||||||
Subproject commit 3f4be208ff3ef2bad6cd8bf9bf544e9dec59096a
|
Subproject commit b630aceb26b6bec59f60b5f92188af39b6e311a2
|
@ -397,7 +397,7 @@ hardenDefconfig() {
|
|||||||
fi;
|
fi;
|
||||||
done
|
done
|
||||||
#Disable supported options
|
#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
|
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");
|
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;
|
fi;
|
||||||
|
@ -101,6 +101,7 @@ patchWorkspace() {
|
|||||||
source build/envsetup.sh;
|
source build/envsetup.sh;
|
||||||
repopick -it n_asb_09-2018-qcom;
|
repopick -it n_asb_09-2018-qcom;
|
||||||
#repopick -it bt-sbc-hd-dualchannel-nougat;
|
#repopick -it bt-sbc-hd-dualchannel-nougat;
|
||||||
|
repopick 201113; #wifi country code fix
|
||||||
repopick 244387 244388; #loopback fixes
|
repopick 244387 244388; #loopback fixes
|
||||||
|
|
||||||
source "$DOS_SCRIPTS/Patch.sh";
|
source "$DOS_SCRIPTS/Patch.sh";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user