summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorSalvatore Mesoraca <s.mesoraca16@gmail.com>2015-08-03 06:40:51 -0400
committerJames Morris <james.l.morris@oracle.com>2015-08-03 11:36:18 -0400
commit5413fcdbe9e7ca32ce3f00fd5251dfa560b7484b (patch)
tree8cd7967bdd3f62d7f7827fe511574b6e093480af /security
parent74d33293e467df61de1b1d8b2fbe29e550dec33b (diff)
Adding YAMA hooks also when YAMA is not stacked.
Without this patch YAMA will not work at all if it is chosen as the primary LSM instead of being "stacked". Signed-off-by: Salvatore Mesoraca <s.mesoraca16@gmail.com> Acked-by: Kees Cook <keescook@chromium.org> Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'security')
-rw-r--r--security/yama/yama_lsm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
index 9ed32502470e..5ebb89687936 100644
--- a/security/yama/yama_lsm.c
+++ b/security/yama/yama_lsm.c
@@ -406,6 +406,7 @@ static __init int yama_init(void)
406 */ 406 */
407 if (!security_module_enable("yama")) 407 if (!security_module_enable("yama"))
408 return 0; 408 return 0;
409 yama_add_hooks();
409#endif 410#endif
410 pr_info("Yama: becoming mindful.\n"); 411 pr_info("Yama: becoming mindful.\n");
411 412