Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce63bbb2 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: qcs405: Enable security configs to harden kernel"

parents ed380278 2554e2ae

arch/arm64/configs/vendor/qcs405-perf_defconfig

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_KALLSYMS_ALL=y

CONFIG_EMBEDDED=y

CONFIG_SLAB_FREELIST_HARDENED=y

CONFIG_PROFILING=y

CONFIG_CC_STACKPROTECTOR_STRONG=y

CONFIG_MODULES=y
@@ -49,6 +50,7 @@ CONFIG_SWP_EMULATION=y 
CONFIG_CP15_BARRIER_EMULATION=y

CONFIG_SETEND_EMULATION=y

CONFIG_ARM64_SW_TTBR0_PAN=y

CONFIG_RANDOMIZE_BASE=y

CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_COMPAT=y
@@ -511,6 +513,7 @@ CONFIG_PANIC_ON_OOPS=y 
CONFIG_PANIC_TIMEOUT=5

CONFIG_SCHEDSTATS=y

CONFIG_IPC_LOGGING=y

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_CORESIGHT=y

CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y

CONFIG_CORESIGHT_DYNAMIC_REPLICATOR=y
@@ -526,6 +529,7 @@ CONFIG_SECURITY=y 
CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_HARDENED_USERCOPY=y

CONFIG_HARDENED_USERCOPY_PAGESPAN=y

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XCBC=y

arch/arm64/configs/vendor/qcs405_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_KALLSYMS_ALL=y

CONFIG_EMBEDDED=y

CONFIG_SLAB_FREELIST_HARDENED=y

CONFIG_PROFILING=y

CONFIG_CC_STACKPROTECTOR_STRONG=y

CONFIG_MODULES=y
@@ -52,6 +53,7 @@ CONFIG_SWP_EMULATION=y 
CONFIG_CP15_BARRIER_EMULATION=y

CONFIG_SETEND_EMULATION=y

CONFIG_ARM64_SW_TTBR0_PAN=y

CONFIG_RANDOMIZE_BASE=y

CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_COMPAT=y
@@ -545,7 +547,6 @@ CONFIG_SCHED_STACK_END_CHECK=y 
CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_ATOMIC_SLEEP=y

CONFIG_DEBUG_LIST=y

CONFIG_FAULT_INJECTION=y

CONFIG_FAIL_PAGE_ALLOC=y

CONFIG_UFS_FAULT_INJECTION=y
@@ -556,6 +557,7 @@ CONFIG_QCOM_RTB=y 
CONFIG_QCOM_RTB_SEPARATE_CPUS=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_LKDTM=y

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_CORESIGHT=y

CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y

CONFIG_CORESIGHT_SOURCE_ETM4X=y
@@ -574,6 +576,7 @@ CONFIG_SECURITY=y 
CONFIG_SECURITY_NETWORK=y

CONFIG_LSM_MMAP_MIN_ADDR=4096

CONFIG_HARDENED_USERCOPY=y

CONFIG_HARDENED_USERCOPY_PAGESPAN=y

CONFIG_SECURITY_SELINUX=y

CONFIG_CRYPTO_CTR=y

CONFIG_CRYPTO_XCBC=y