summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2014-04-0326-175/+208
|\
| * selinux: correctly label /proc inodes in use before the policy is loadedPaul Moore2014-03-191-9/+27
| * selinux: put the mmap() DAC controls before the MAC controlsPaul Moore2014-03-191-12/+8
| * Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zo...James Morris2014-03-1218-134/+153
| |\
| | * evm: enable key retention service automaticallyDmitry Kasatkin2014-03-071-2/+3
| | * ima: skip memory allocation for empty filesDmitry Kasatkin2014-03-071-8/+12
| | * evm: EVM does not use MD5Dmitry Kasatkin2014-03-071-1/+0
| | * ima: return d_name.name if d_path failsDmitry Kasatkin2014-03-072-7/+2
| | * integrity: fix checkpatch errorsDmitry Kasatkin2014-03-0711-70/+69
| | * ima: fix erroneous removal of security.ima xattrDmitry Kasatkin2014-03-071-2/+4
| | * security: integrity: Use a more current logging styleJoe Perches2014-03-077-11/+27
| | * ima: reduce memory usage when a template containing the n field is usedRoberto Sassu2014-03-072-17/+13
| | * ima: restore the original behavior for sending data with ima templateRoberto Sassu2014-03-073-4/+10
| | * Integrity: Pass commname via get_task_comm()Tetsuo Handa2014-03-071-1/+2
| | * ima: use static const char array definitionsMimi Zohar2014-03-074-10/+10
| | * ima: new helper: file_inode(file)Libo Chen2014-03-041-1/+1
| * | security: have cap_dentry_init_security return errorJeff Layton2014-03-071-1/+1
| |/
| * security: cleanup Makefiles to use standard syntax for specifying sub-directo...Sam Ravnborg2014-02-172-8/+8
| * security: replace strict_strto*() with kstrto*()Jingoo Han2014-02-067-12/+12
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-04-021-2/+3
|\ \
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-03-258-29/+46
| |\ \
| * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-03-141-1/+5
| |\ \ \
| * \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-03-051-4/+4
| |\ \ \ \
| * | | | | flowcache: Make flow cache name space awareFan Du2014-02-121-2/+3
* | | | | | Merge branch 'compat' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/l...Linus Torvalds2014-03-311-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | security/compat: convert to COMPAT_SYSCALL_DEFINEHeiko Carstens2014-03-061-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2014-03-188-29/+46
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | selinux: add gfp argument to security_xfrm_policy_alloc and fix callersNikolay Aleksandrov2014-03-108-29/+46
| |/ / /
* | | | KEYS: Make the keyring cycle detector ignore other keyrings of the same nameDavid Howells2014-03-091-1/+5
|/ / /
* | | Merge branch 'stable-3.14' of git://git.infradead.org/users/pcmoore/selinux i...James Morris2014-02-241-4/+4
|\ \ \ | |/ / |/| |
| * | SELinux: bigendian problems with filename trans rulesEric Paris2014-02-201-4/+4
* | | Merge branch 'stable-3.14' of git://git.infradead.org/users/pcmoore/selinux i...James Morris2014-02-102-0/+6
|\ \ \ | |/ /
| * | SELinux: Fix kernel BUG on empty security contexts.Stephen Smalley2014-02-051-0/+4
| * | selinux: add SOCK_DIAG_BY_FAMILY to the list of netlink message typesPaul Moore2014-02-051-0/+2
| * | Merge tag 'v3.13' into stable-3.14Paul Moore2014-02-0554-1239/+2802
| |\ \
* | | | security: select correct default LSM_MMAP_MIN_ADDR on arm on arm64Colin Cross2014-02-051-1/+1
* | | | Merge git://git.infradead.org/users/eparis/auditLinus Torvalds2014-01-232-11/+6
|\ \ \ \
| * | | | smack: call WARN_ONCE() instead of calling audit_log_start()Richard Guy Briggs2014-01-131-3/+2
| * | | | selinux: call WARN_ONCE() instead of calling audit_log_start()Richard Guy Briggs2014-01-131-8/+4
| * | | | Merge tag 'v3.12'Eric Paris2013-11-2233-619/+1720
| |\ \ \ \
* | \ \ \ \ Merge branch 'for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/c...Linus Torvalds2014-01-211-4/+3
|\ \ \ \ \ \
| * | | | | | cgroup: replace cftype->read_seq_string() with cftype->seq_show()Tejun Heo2013-12-051-4/+3
* | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2014-01-2111-148/+366
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into nextJames Morris2014-01-081-1/+13
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | SELinux: Fix memory leak upon loading policyTetsuo Handa2014-01-071-1/+13
| * | | | | Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into nextJames Morris2014-01-077-39/+164
| |\ \ \ \ \ | | |/ / / /
| | * | | | selinux: selinux_setprocattr()->ptrace_parent() needs rcu_read_lock()Oleg Nesterov2013-12-161-2/+2
| | * | | | SELinux: remove duplicated include from hooks.cWei Yongjun2013-12-161-1/+0
| | * | | | selinux: revert 102aefdda4d8275ce7d7100bc16c88c74272b260Paul Moore2013-12-132-60/+22
| | * | | | selinux: fix broken peer recv checkChad Hanson2013-12-111-1/+3
OpenPOWER on IntegriCloud