summaryrefslogtreecommitdiffstats
path: root/security/yama
diff options
context:
space:
mode:
authorSalvatore Mesoraca2015-08-03 12:40:51 +0200
committerJames Morris2015-08-03 17:36:18 +0200
commit5413fcdbe9e7ca32ce3f00fd5251dfa560b7484b (patch)
tree8cd7967bdd3f62d7f7827fe511574b6e093480af /security/yama
parentLinux 4.2-rc5 (diff)
downloadkernel-qcow2-linux-5413fcdbe9e7ca32ce3f00fd5251dfa560b7484b.tar.gz
kernel-qcow2-linux-5413fcdbe9e7ca32ce3f00fd5251dfa560b7484b.tar.xz
kernel-qcow2-linux-5413fcdbe9e7ca32ce3f00fd5251dfa560b7484b.zip
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/yama')
-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)
*/
if (!security_module_enable("yama"))
return 0;
+ yama_add_hooks();
#endif
pr_info("Yama: becoming mindful.\n");