[PATCH 14/18] Yama: Initialize as LSM_TYPE_MINOR
From: Kees Cook <hidden>
Date: 2018-09-16 00:31:22
Also in:
lkml
Subsystem:
security subsystem, the rest, yama security module · Maintainers:
Paul Moore, James Morris, "Serge E. Hallyn", Linus Torvalds, Kees Cook
This converts Yama to use the new LSM_TYPE_MINOR marking. Signed-off-by: Kees Cook <redacted> --- include/linux/lsm_hooks.h | 5 ----- security/security.c | 1 - security/yama/yama_lsm.c | 8 +++++++- 3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
index 5e0ca4a05091..0564153130c8 100644
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h@@ -2102,10 +2102,5 @@ static inline void security_delete_hooks(struct security_hook_list *hooks, #endif /* CONFIG_SECURITY_WRITABLE_HOOKS */ extern void __init capability_add_hooks(void); -#ifdef CONFIG_SECURITY_YAMA -extern void __init yama_add_hooks(void); -#else -static inline void __init yama_add_hooks(void) { } -#endif #endif /* ! __LINUX_LSM_HOOKS_H */
diff --git a/security/security.c b/security/security.c
index 65d7ba1bc1ef..c6ca07fc0771 100644
--- a/security/security.c
+++ b/security/security.c@@ -125,7 +125,6 @@ int __init security_init(void) * Load minor LSMs, with the capability module always first. */ capability_add_hooks(); - yama_add_hooks(); lsm_init(LSM_TYPE_MINOR); /*
diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
index ffda91a4a1aa..e970917926d9 100644
--- a/security/yama/yama_lsm.c
+++ b/security/yama/yama_lsm.c@@ -477,9 +477,15 @@ static void __init yama_init_sysctl(void) static inline void yama_init_sysctl(void) { } #endif /* CONFIG_SYSCTL */ -void __init yama_add_hooks(void) +static int __init yama_init(void) { pr_info("Yama: becoming mindful.\n"); security_add_hooks(yama_hooks, ARRAY_SIZE(yama_hooks), "yama"); yama_init_sysctl(); + return 0; } + +DEFINE_LSM(yama) + .type = LSM_TYPE_MINOR, + .init = yama_init, +END_LSM;
--
2.17.1