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

665aadc1 · Linus Torvalds <[email protected]> · 2015-08-03 11:00:53 -07:00

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.

Commit: 665aadc1d69e6f98c01194531fa558224545ce22
Parents: abeb4f57 · 5413fcdb

Merge commit. Changes below are compared with the first parent: abeb4f57.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
security/yama/yama_lsm.c	modified	+1	−0	View file

security/yama/yama_lsm.c

View file

diff --git a/security/yama/yama_lsm.c b/security/yama/yama_lsm.c
index 9ed3250..5ebb896 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");
 