Commit 665aadc1 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull security layer fix from James Morris:
 "Yama initialization fix"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  Adding YAMA hooks also when YAMA is not stacked.
parents abeb4f57 5413fcdb
...@@ -406,6 +406,7 @@ static __init int yama_init(void) ...@@ -406,6 +406,7 @@ static __init int yama_init(void)
*/ */
if (!security_module_enable("yama")) if (!security_module_enable("yama"))
return 0; return 0;
yama_add_hooks();
#endif #endif
pr_info("Yama: becoming mindful.\n"); pr_info("Yama: becoming mindful.\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment