From ec418d9aa9208b9ea9c50264eafa034ab96d73c6 Mon Sep 17 00:00:00 2001
From: wanxiaoqing <wanxiaoqing@huawei.com>
Date: Tue, 8 Aug 2023 19:28:07 +0800
Subject: [PATCH] =?UTF-8?q?config=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wanxiaoqing <wanxiaoqing@huawei.com>
---
 linux-5.10/base_defconfig              | 13 +++++++++++++
 linux-5.10/rk3568/arch/arm64_defconfig |  5 -----
 linux-5.10/type/standard_defconfig     |  6 ------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/linux-5.10/base_defconfig b/linux-5.10/base_defconfig
index 2c37003..dd07a3e 100644
--- a/linux-5.10/base_defconfig
+++ b/linux-5.10/base_defconfig
@@ -6,6 +6,19 @@ CONFIG_EPOLL=y
 CONFIG_EVENTFD=y
 # end of General setup
 
+CONFIG_ARM64_PTR_AUTH = y
+CONFIG_INIT_STACK_ALL_ZERO=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_ARM64_PAN=y
+CONFIG_CFI_CLANG=y
+CONFIG_HAVE_ARCH_SECCOMP=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECURITY_XPM=y
+CONFIG_SECCOMP=y
+CONFIG_SECCOMP_FILTER=y
+
 CONFIG_MMU=y
 
 #
diff --git a/linux-5.10/rk3568/arch/arm64_defconfig b/linux-5.10/rk3568/arch/arm64_defconfig
index f86262e..c5bf3b5 100644
--- a/linux-5.10/rk3568/arch/arm64_defconfig
+++ b/linux-5.10/rk3568/arch/arm64_defconfig
@@ -300,7 +300,6 @@ CONFIG_SETEND_EMULATION=y
 # ARMv8.1 architectural features
 #
 CONFIG_ARM64_HW_AFDBM=y
-CONFIG_ARM64_PAN=y
 CONFIG_AS_HAS_LSE_ATOMICS=y
 CONFIG_ARM64_VHE=y
 # end of ARMv8.1 architectural features
@@ -469,7 +468,6 @@ CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_LTO=y
 CONFIG_LTO_CLANG=y
 CONFIG_LTO_CLANG_THIN=y
-CONFIG_CFI_CLANG=y
 CONFIG_CFI_CLANG_SHADOW=y
 CONFIG_HAVE_MOVE_PMD=y
 CONFIG_MODULES_USE_ELF_RELA=y
@@ -5633,8 +5631,6 @@ CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,bpf,selinux"
 #
 # CONFIG_INIT_STACK_NONE is not set
 # CONFIG_INIT_STACK_ALL_PATTERN is not set
-CONFIG_INIT_STACK_ALL_ZERO=y
-CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
 # end of Memory initialization
 # end of Kernel hardening options
@@ -6096,6 +6092,5 @@ CONFIG_BLACKBOX_ROCKCHIP=y
 #
 # executable permission manager
 #
-CONFIG_SECURITY_XPM=y
 CONFIG_SECURITY_XPM_DEBUG=y
 # end of executable permission manager
diff --git a/linux-5.10/type/standard_defconfig b/linux-5.10/type/standard_defconfig
index 1510d1c..717514e 100644
--- a/linux-5.10/type/standard_defconfig
+++ b/linux-5.10/type/standard_defconfig
@@ -167,7 +167,6 @@ CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_KUSER_HELPERS=y
 CONFIG_RELOCATABLE=y
-CONFIG_RANDOMIZE_BASE=y
 # end of Kernel Features
 
 #
@@ -248,10 +247,6 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
-CONFIG_HAVE_ARCH_SECCOMP=y
-CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP=y
-CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_ARCH_STACKLEAK=y
 CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
@@ -987,7 +982,6 @@ CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_PATH=y
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HARDENED_USERCOPY=y
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_DEVELOP=y
-- 
Gitee