diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-03 09:26:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-03 09:26:18 -0700 |
| commit | bea803183e12a1c78a12ec70907174d13d958333 (patch) | |
| tree | 56a720b1eb02bb15ce5135078d9bbcbf06b74235 /MAINTAINERS | |
| parent | cd6362befe4cc7bf589a5236d2a780af2d47bcc9 (diff) | |
| parent | f64410ec665479d7b4b77b7519e814253ed0f686 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security subsystem updates from James Morris:
"Apart from reordering the SELinux mmap code to ensure DAC is called
before MAC, these are minor maintenance updates"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (23 commits)
selinux: correctly label /proc inodes in use before the policy is loaded
selinux: put the mmap() DAC controls before the MAC controls
selinux: fix the output of ./scripts/get_maintainer.pl for SELinux
evm: enable key retention service automatically
ima: skip memory allocation for empty files
evm: EVM does not use MD5
ima: return d_name.name if d_path fails
integrity: fix checkpatch errors
ima: fix erroneous removal of security.ima xattr
security: integrity: Use a more current logging style
MAINTAINERS: email updates and other misc. changes
ima: reduce memory usage when a template containing the n field is used
ima: restore the original behavior for sending data with ima template
Integrity: Pass commname via get_task_comm()
fs: move i_readcount
ima: use static const char array definitions
security: have cap_dentry_init_security return error
ima: new helper: file_inode(file)
kernel: Mark function as static in kernel/seccomp.c
capability: Use current logging styles
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 11b3937adb89..346744599b4f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3401,7 +3401,9 @@ F: Documentation/filesystems/ext4.txt F: fs/ext4/ Extended Verification Module (EVM) -M: Mimi Zohar <zohar@us.ibm.com> +M: Mimi Zohar <zohar@linux.vnet.ibm.com> +L: linux-ima-devel@lists.sourceforge.net +L: linux-security-module@vger.kernel.org S: Supported F: security/integrity/evm/ @@ -4423,8 +4425,11 @@ S: Maintained F: drivers/ipack/ INTEGRITY MEASUREMENT ARCHITECTURE (IMA) -M: Mimi Zohar <zohar@us.ibm.com> +M: Mimi Zohar <zohar@linux.vnet.ibm.com> M: Dmitry Kasatkin <d.kasatkin@samsung.com> +L: linux-ima-devel@lists.sourceforge.net +L: linux-ima-user@lists.sourceforge.net +L: linux-security-module@vger.kernel.org S: Supported F: security/integrity/ima/ @@ -5092,8 +5097,8 @@ F: include/keys/ F: security/keys/ KEYS-TRUSTED -M: David Safford <safford@watson.ibm.com> -M: Mimi Zohar <zohar@us.ibm.com> +M: David Safford <safford@us.ibm.com> +M: Mimi Zohar <zohar@linux.vnet.ibm.com> L: linux-security-module@vger.kernel.org L: keyrings@linux-nfs.org S: Supported @@ -5103,8 +5108,8 @@ F: security/keys/trusted.c F: security/keys/trusted.h KEYS-ENCRYPTED -M: Mimi Zohar <zohar@us.ibm.com> -M: David Safford <safford@watson.ibm.com> +M: Mimi Zohar <zohar@linux.vnet.ibm.com> +M: David Safford <safford@us.ibm.com> L: linux-security-module@vger.kernel.org L: keyrings@linux-nfs.org S: Supported @@ -7787,11 +7792,10 @@ M: Security Officers <security@kernel.org> S: Supported SELINUX SECURITY MODULE +M: Paul Moore <paul@paul-moore.com> M: Stephen Smalley <sds@tycho.nsa.gov> -M: James Morris <james.l.morris@oracle.com> M: Eric Paris <eparis@parisplace.org> -M: Paul Moore <paul@paul-moore.com> -L: selinux@tycho.nsa.gov (subscribers-only, general discussion) +L: selinux@tycho.nsa.gov (moderated for non-subscribers) W: http://selinuxproject.org T: git git://git.infradead.org/users/pcmoore/selinux S: Supported |