summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | | | selinux: process labeled IPsec TCP SYN-ACK packets properly in selinux_ip_pos...Paul Moore2013-12-101-7/+35
| | * | | | selinux: look for IPsec labels on both inbound and outbound packetsPaul Moore2013-12-093-14/+47
| | * | | | selinux: pull address family directly from the request_sock structPaul Moore2013-12-041-5/+1
| | * | | | selinux: ensure that the cached NetLabel secattr matches the desired SIDPaul Moore2013-12-041-1/+30
| | * | | | selinux: handle TCP SYN-ACK packets correctly in selinux_ip_postroute()Paul Moore2013-12-041-15/+53
| | * | | | selinux: handle TCP SYN-ACK packets correctly in selinux_ip_output()Paul Moore2013-12-041-2/+23
| | * | | | selinux: fix possible memory leakGeyslan G. Bem2013-11-251-4/+7
| | * | | | SELinux: security_load_policy: Silence frame-larger-than warningTim Gardner2013-11-191-22/+32
| | * | | | SELinux: Update policy version to support constraints infoRichard Haines2013-11-194-10/+101
| | * | | | Merge tag 'v3.12'Paul Moore2013-11-0833-619/+1720
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| * | | | | Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPMJames Morris2014-01-0629-326/+361
| |\ \ \ \ \
| * | | | | | ima: remove unneeded size_limit argument from ima_eventdigest_init_common()Roberto Sassu2014-01-031-8/+6
| * | | | | | ima: pass HASH_ALGO__LAST as hash algo in ima_eventdigest_init()Roberto Sassu2014-01-031-2/+2
| * | | | | | ima: change the default hash algorithm to SHA1 in ima_eventdigest_ng_init()Roberto Sassu2014-01-031-1/+1
| * | | | | | Smack: File receive audit correctionCasey Schaufler2013-12-311-1/+1
| * | | | | | Smack: Rationalize mount restrictionsCasey Schaufler2013-12-311-54/+29
| * | | | | | Smack: change rule cap checkCasey Schaufler2013-12-231-1/+1
| * | | | | | Smack: Make the syslog control configurableCasey Schaufler2013-12-233-13/+99
| * | | | | | Smack: Prevent the * and @ labels from being used in SMACK64EXECCasey Schaufler2013-12-191-16/+37