Linus Torvalds bea803183e 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 ...		2014-04-03 09:26:18 -07:00
..
encrypted-keys	security: replace strict_strto*() with kstrto*()	2014-02-06 19:11:04 +11:00
big_key.c	security: shmem: implement kernel private shmem inodes	2013-12-02 11:24:19 +00:00
compat.c	security/compat: convert to COMPAT_SYSCALL_DEFINE	2014-03-06 16:30:42 +01:00
gc.c	KEYS: Fix keyring content gc scanner	2013-11-14 14:09:53 +00:00
internal.h	KEYS: Add per-user_namespace registers for persistent per-UID kerberos caches	2013-09-24 10:35:19 +01:00
Kconfig	KEYS: Make BIG_KEYS boolean	2013-10-30 11:15:23 +00:00
key.c	KEYS: Pre-clear struct key on allocation	2013-12-02 11:24:18 +00:00
keyctl.c	KEYS: Add per-user_namespace registers for persistent per-UID kerberos caches	2013-09-24 10:35:19 +01:00
keyring.c	KEYS: Make the keyring cycle detector ignore other keyrings of the same name	2014-03-09 18:57:18 -07:00
Makefile	KEYS: Add per-user_namespace registers for persistent per-UID kerberos caches	2013-09-24 10:35:19 +01:00
permission.c	userns: Convert security/keys to the new userns infrastructure	2012-09-13 18:28:02 -07:00
persistent.c	KEYS: Fix UID check in keyctl_get_persistent()	2013-11-06 14:01:51 +00:00
proc.c	KEYS: Introduce a search context structure	2013-09-24 10:35:15 +01:00
process_keys.c	KEYS: initialize root uid and session keyrings early	2013-09-25 17:17:01 +01:00
request_key_auth.c	KEYS: Search for auth-key by name rather than target key ID	2013-09-24 10:35:16 +01:00
request_key.c	KEYS: Fix a race between negating a key and reading the error set	2013-10-30 11:15:24 +00:00
sysctl.c	KEYS: Add per-user_namespace registers for persistent per-UID kerberos caches	2013-09-24 10:35:19 +01:00
trusted.c	security: replace strict_strto*() with kstrto*()	2014-02-06 19:11:04 +11:00
trusted.h	trusted-keys: rename trusted_defined files to trusted	2011-01-24 10:14:22 +11:00
user_defined.c	KEYS: Introduce a search context structure	2013-09-24 10:35:15 +01:00