diff options
| author | Linus Torvalds | 2015-08-03 20:00:53 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2015-08-03 20:00:53 +0200 |
| commit | 665aadc1d69e6f98c01194531fa558224545ce22 (patch) | |
| tree | 9e5401425920f429f2da1b3826ee4bfb53c88591 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | Adding YAMA hooks also when YAMA is not stacked. (diff) | |
| download | kernel-qcow2-linux-665aadc1d69e6f98c01194531fa558224545ce22.tar.gz kernel-qcow2-linux-665aadc1d69e6f98c01194531fa558224545ce22.tar.xz kernel-qcow2-linux-665aadc1d69e6f98c01194531fa558224545ce22.zip | |
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"); |