aboutsummaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAge
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2013-12-15
|\
| * Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux_fixes ...James Morris2013-12-12
| |\
| | * selinux: process labeled IPsec TCP SYN-ACK packets properly in selinux_ip_pos...Paul Moore2013-12-12
| | * selinux: look for IPsec labels on both inbound and outbound packetsPaul Moore2013-12-12
| | * selinux: handle TCP SYN-ACK packets correctly in selinux_ip_postroute()Paul Moore2013-12-12
| | * selinux: handle TCP SYN-ACK packets correctly in selinux_ip_output()Paul Moore2013-12-12
| | * selinux: fix possible memory leakGeyslan G. Bem2013-12-04
| | * Merge tag 'v3.12'Paul Moore2013-11-26
| | |\
* | | | Revert "selinux: consider filesystem subtype in policies"Linus Torvalds2013-12-15
|/ / /
* | | Merge tag 'keys-devel-20131210' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2013-12-12
|\ \ \
| * | | security: shmem: implement kernel private shmem inodesEric Paris2013-12-02
| * | | KEYS: Fix searching of nested keyringsDavid Howells2013-12-02
| * | | KEYS: Fix multiple key add into associative arrayDavid Howells2013-12-02
| * | | KEYS: Fix the keyring hash functionDavid Howells2013-12-02
| * | | KEYS: Pre-clear struct key on allocationDavid Howells2013-12-02
* | | | ima: properly free ima_template_entry structuresRoberto Sassu2013-12-02
* | | | ima: Do not free 'entry' before it is initializedChristoph Paasch2013-12-02
|/ / /
* | | ima: store address of template_fmt_copy in a pointer before calling strsepRoberto Sassu2013-11-29
* | | ima: make a copy of template_fmt in template_desc_init_fields()Roberto Sassu2013-11-25
* | | ima: do not send field length to userspace for digest of ima templateRoberto Sassu2013-11-25
* | | ima: do not include field length in template digest calc for ima templateRoberto Sassu2013-11-25
* | | Revert "ima: define '_ima' as a builtin 'trusted' keyring"Linus Torvalds2013-11-23
* | | Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jm...Linus Torvalds2013-11-21
|\ \ \
| * | | KEYS: Fix keyring content gc scannerDavid Howells2013-11-14
| * | | KEYS: Fix error handling in big_key instantiationDavid Howells2013-11-13
| * | | KEYS: Fix UID check in keyctl_get_persistent()David Howells2013-11-06
| * | | ima: define '_ima' as a builtin 'trusted' keyringMimi Zohar2013-10-31
| * | | ima: extend the measurement list to include the file signatureMimi Zohar2013-10-31
| * | | Merge branch 'keys-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/dh...James Morris2013-10-30
| |\ \ \
| | * | | KEYS: fix error return code in big_key_instantiate()Wei Yongjun2013-10-30
| | * | | KEYS: Fix keyring quota misaccounting on key replacement and unlinkDavid Howells2013-10-30
| | * | | KEYS: Fix a race between negating a key and reading the error setDavid Howells2013-10-30
| | * | | KEYS: Make BIG_KEYS booleanJosh Boyer2013-10-30
| * | | | apparmor: remove the "task" arg from may_change_ptraced_domain()Oleg Nesterov2013-10-30
| * | | | apparmor: remove parent task info from audit loggingJohn Johansen2013-10-30
| * | | | apparmor: remove tsk field from the apparmor_audit_structJohn Johansen2013-10-30
| * | | | apparmor: fix capability to not use the current task, during reportingJohn Johansen2013-10-30
| |/ / /
| * | | Merge branch 'smack-for-3.13' of git://git.gitorious.org/smack-next/kernel in...James Morris2013-10-29
| |\ \ \
| | * | | Smack: Ptrace access check modeCasey Schaufler2013-10-28
| | * | | Smack: Implement lock security modeCasey Schaufler2013-10-18
| * | | | ima: provide hash algo info in the xattrDmitry Kasatkin2013-10-26
| * | | | ima: enable support for larger default filedata hash algorithmsMimi Zohar2013-10-26
| * | | | ima: define kernel parameter 'ima_template=' to change configured defaultRoberto Sassu2013-10-26
| * | | | ima: add Kconfig default measurement list templateMimi Zohar2013-10-26
| * | | | ima: defer determining the appraisal hash algorithm for 'ima' templateRoberto Sassu2013-10-26
| * | | | ima: add audit log support for larger hashesMimi Zohar2013-10-26
| * | | | ima: switch to new template management mechanismRoberto Sassu2013-10-25
| * | | | ima: define new template ima-ng and template fields d-ng and n-ngRoberto Sassu2013-10-25
| * | | | ima: define template fields library and new helpersRoberto Sassu2013-10-25
| * | | | ima: new templates management mechanismRoberto Sassu2013-10-25