summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2015-07-24 03:02:48 +0200
committerJames Morris <james.l.morris@oracle.com>2015-07-28 05:18:19 +0200
commit730daa164e7c7e31c08fab940549f4acc3329432 (patch)
tree8c125b404c785f8de46a04d4f43fccef6744f0a8 /MAINTAINERS
parentMerge tag 'seccomp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kee... (diff)
downloadlinux-730daa164e7c7e31c08fab940549f4acc3329432.tar.xz
linux-730daa164e7c7e31c08fab940549f4acc3329432.zip
Yama: remove needless CONFIG_SECURITY_YAMA_STACKED
Now that minor LSMs can cleanly stack with major LSMs, remove the unneeded config for Yama to be made to explicitly stack. Just selecting the main Yama CONFIG will allow it to work, regardless of the major LSM. Since distros using Yama are already forcing it to stack, this is effectively a no-op change. Additionally add MAINTAINERS entry. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: James Morris <james.l.morris@oracle.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a2264167791a..f8be2f797197 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9102,6 +9102,12 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git
S: Supported
F: security/apparmor/
+YAMA SECURITY MODULE
+M: Kees Cook <keescook@chromium.org>
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git yama/tip
+S: Supported
+F: security/yama/
+
SENSABLE PHANTOM
M: Jiri Slaby <jirislaby@gmail.com>
S: Maintained