From 076032ea2e5c2cf2f5dd6bd417c549286217c46d Mon Sep 17 00:00:00 2001 From: quebs2 Date: Wed, 28 Oct 2020 15:36:04 +0800 Subject: [PATCH] Remove CONFIG_CONSOLE_UNHASHED_POINTERS on userdebug. Remove the CONFIG_CONSOLE_UNHASHED_POINTERS to address STS case in CVE_2016_6752 on userdebug build. Propagated from: (CR). Change-Id: I6881210947fec60689894411d84a4865aea70df4 Signed-off-by: quebs2 Reviewed-on: https://gerrit.mot.com/1786973 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- arch/arm64/configs/vendor/holi_consolidate.config | 2 +- arch/arm64/configs/vendor/holi_debug.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/vendor/holi_consolidate.config b/arch/arm64/configs/vendor/holi_consolidate.config index 2e6b0caad2af..b373865fe005 100644 --- a/arch/arm64/configs/vendor/holi_consolidate.config +++ b/arch/arm64/configs/vendor/holi_consolidate.config @@ -29,7 +29,7 @@ CONFIG_SERIAL_MSM_GENI_CONSOLE=y CONFIG_QCOM_RTB=y CONFIG_QCOM_RTB_SEPARATE_CPUS=y CONFIG_QCOM_RTB_QGKI=y -CONFIG_DEBUG_CONSOLE_UNHASHED_POINTERS=y +#CONFIG_DEBUG_CONSOLE_UNHASHED_POINTERS is not set CONFIG_COMMON_CLK_QCOM_DEBUG=y CONFIG_CNSS2_DEBUG=y CONFIG_NL80211_TESTMODE=y diff --git a/arch/arm64/configs/vendor/holi_debug.config b/arch/arm64/configs/vendor/holi_debug.config index 74a3f1b4b1d5..8cf2926d45f4 100644 --- a/arch/arm64/configs/vendor/holi_debug.config +++ b/arch/arm64/configs/vendor/holi_debug.config @@ -29,7 +29,7 @@ CONFIG_QCOM_RTB_QGKI=y CONFIG_IPA_DEBUG=y CONFIG_IPA_UT=y CONFIG_MSM_ADSPRPC=y -CONFIG_DEBUG_CONSOLE_UNHASHED_POINTERS=y +#CONFIG_DEBUG_CONSOLE_UNHASHED_POINTERS is not set CONFIG_COMMON_CLK_QCOM_DEBUG=y CONFIG_I2C_MSM_GENI=y CONFIG_SPI_MSM_GENI=y