summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@infradead.org>2025-08-24 15:28:00 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-10-15 11:59:55 +0200
commit1c060a147670c8d143c20837497bb7f246c739c5 (patch)
tree37911798ec49573192430a3e7e6824bb616faad2 /security
parentd607e6b349b014df1d2d0399f6667322626450e0 (diff)
downloadlinux-1c060a147670c8d143c20837497bb7f246c739c5.tar.gz
linux-1c060a147670c8d143c20837497bb7f246c739c5.tar.bz2
linux-1c060a147670c8d143c20837497bb7f246c739c5.zip
lsm: CONFIG_LSM can depend on CONFIG_SECURITY
[ Upstream commit 54d94c422fed9575b74167333c1757847a4e6899 ] When CONFIG_SECURITY is not set, CONFIG_LSM (builtin_lsm_order) does not need to be visible and settable since builtin_lsm_order is defined in security.o, which is only built when CONFIG_SECURITY=y. So make CONFIG_LSM depend on CONFIG_SECURITY. Fixes: 13e735c0e953 ("LSM: Introduce CONFIG_LSM") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> [PM: subj tweak] Signed-off-by: Paul Moore <paul@paul-moore.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'security')
-rw-r--r--security/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/security/Kconfig b/security/Kconfig
index 28e685f53bd1..ce9f1a651ccc 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -264,6 +264,7 @@ endchoice
config LSM
string "Ordered list of enabled LSMs"
+ depends on SECURITY
default "landlock,lockdown,yama,loadpin,safesetid,smack,selinux,tomoyo,apparmor,ipe,bpf" if DEFAULT_SECURITY_SMACK
default "landlock,lockdown,yama,loadpin,safesetid,apparmor,selinux,smack,tomoyo,ipe,bpf" if DEFAULT_SECURITY_APPARMOR
default "landlock,lockdown,yama,loadpin,safesetid,tomoyo,ipe,bpf" if DEFAULT_SECURITY_TOMOYO