diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-03 11:00:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-03 11:00:53 -0700 |
| commit | 665aadc1d69e6f98c01194531fa558224545ce22 (patch) | |
| tree | 9e5401425920f429f2da1b3826ee4bfb53c88591 | |
| parent | abeb4f572d1c4e3c996a427c19e52601dee044e8 (diff) | |
| parent | 5413fcdbe9e7ca32ce3f00fd5251dfa560b7484b (diff) | |
| download | linux-665aadc1d69e6f98c01194531fa558224545ce22.tar.bz2 | |
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.
| -rw-r--r-- | security/yama/yama_lsm.c | 1 |
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"); |