Skip to content

Commit 20655bf

Browse files
committed
deepin: config: x86_desktop_defconfig: enable landlock
deepin inclusion category: feature enable landlock for our x86 config, it has been enabled in our riscv, arm64 and loongarch config, enable it in x86, and it will be used in pacman. Also edit LSM, add landlock for x86 and loongarch. Link: https://bbs.deepin.org.cn/post/295333 Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
1 parent 0d3594d commit 20655bf

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

arch/loongarch/configs/deepin_loongarch_desktop_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5879,7 +5879,7 @@ CONFIG_EVM=y
58795879
CONFIG_EVM_EXTRA_SMACK_XATTRS=y
58805880
CONFIG_EVM_ADD_XATTRS=y
58815881
CONFIG_DEFAULT_SECURITY_APPARMOR=y
5882-
CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo,bpf"
5882+
CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo,bpf"
58835883
CONFIG_INIT_STACK_NONE=y
58845884
CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
58855885
CONFIG_LIST_HARDENED=y

arch/x86/configs/deepin_x86_desktop_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5755,6 +5755,7 @@ CONFIG_SECURITY_YAMA=y
57555755
CONFIG_SECURITY_SAFESETID=y
57565756
CONFIG_SECURITY_LOCKDOWN_LSM=y
57575757
CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y
5758+
CONFIG_SECURITY_LANDLOCK=y
57585759
CONFIG_INTEGRITY_SIGNATURE=y
57595760
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
57605761
CONFIG_INTEGRITY_PLATFORM_KEYRING=y
@@ -5768,7 +5769,7 @@ CONFIG_EVM=y
57685769
CONFIG_EVM_EXTRA_SMACK_XATTRS=y
57695770
CONFIG_EVM_ADD_XATTRS=y
57705771
CONFIG_DEFAULT_SECURITY_APPARMOR=y
5771-
CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo,bpf"
5772+
CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo,bpf"
57725773
CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
57735774
CONFIG_LIST_HARDENED=y
57745775
CONFIG_CRYPTO_USER=m

0 commit comments

Comments
 (0)