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 12:03:17 +0200
commit1341b78de3e6b51cc5494a26b88f3db6909661fb (patch)
tree7b88771ef8d6a5a55d9eebdeb122f8da4f3e3395 /security
parent788bfdb55866beb0ddf0610f92ed1ed4928b8f05 (diff)
downloadlinux-1341b78de3e6b51cc5494a26b88f3db6909661fb.tar.gz
linux-1341b78de3e6b51cc5494a26b88f3db6909661fb.tar.bz2
linux-1341b78de3e6b51cc5494a26b88f3db6909661fb.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 4816fc74f81e..285f284dfcac 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -269,6 +269,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