summaryrefslogtreecommitdiff
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2013-12-153-42/+165
|\
| * Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux_fixes ...James Morris2013-12-133-42/+165
| |\
| | * selinux: process labeled IPsec TCP SYN-ACK packets properly in selinux_ip_pos...Paul Moore2013-12-121-7/+35
| | * selinux: look for IPsec labels on both inbound and outbound packetsPaul Moore2013-12-123-14/+47
| | * selinux: handle TCP SYN-ACK packets correctly in selinux_ip_postroute()Paul Moore2013-12-121-15/+53
| | * selinux: handle TCP SYN-ACK packets correctly in selinux_ip_output()Paul Moore2013-12-121-2/+23
| | * selinux: fix possible memory leakGeyslan G. Bem2013-12-041-4/+7
| | * Merge tag 'v3.12'Paul Moore2013-11-2633-619/+1720
| | |\
* | | | Revert "selinux: consider filesystem subtype in policies"Linus Torvalds2013-12-152-60/+22
|/ / /
* | | Merge tag 'keys-devel-20131210' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2013-12-123-17/+10
|\ \ \
| * | | security: shmem: implement kernel private shmem inodesEric Paris2013-12-021-1/+1
| * | | KEYS: Fix searching of nested keyringsDavid Howells2013-12-021-1/+1
| * | | KEYS: Fix multiple key add into associative arrayDavid Howells2013-12-021-4/+3
| * | | KEYS: Fix the keyring hash functionDavid Howells2013-12-021-4/+4
| * | | KEYS: Pre-clear struct key on allocationDavid Howells2013-12-021-7/+1
* | | | ima: properly free ima_template_entry structuresRoberto Sassu2013-12-023-5/+19
* | | | ima: Do not free 'entry' before it is initializedChristoph Paasch2013-12-021-1/+0
|/ / /
* | | ima: store address of template_fmt_copy in a pointer before calling strsepRoberto Sassu2013-11-301-2/+4
* | | ima: make a copy of template_fmt in template_desc_init_fields()Roberto Sassu2013-11-251-7/+14
* | | ima: do not send field length to userspace for digest of ima templateRoberto Sassu2013-11-253-5/+18
* | | ima: do not include field length in template digest calc for ima templateRoberto Sassu2013-11-253-6/+15
* | | Revert "ima: define '_ima' as a builtin 'trusted' keyring"Linus Torvalds2013-11-234-55/+1
* | | Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jm...Linus Torvalds2013-11-2165-1596/+3204
|\ \ \
| * | | KEYS: Fix keyring content gc scannerDavid Howells2013-11-142-51/+36
| * | | KEYS: Fix error handling in big_key instantiationDavid Howells2013-11-131-0/+1
| * | | KEYS: Fix UID check in keyctl_get_persistent()David Howells2013-11-061-4/+2
| * | | ima: define '_ima' as a builtin 'trusted' keyringMimi Zohar2013-10-314-1/+55
| * | | ima: extend the measurement list to include the file signatureMimi Zohar2013-10-318-12/+73
| * | | Merge branch 'keys-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/dh...James Morris2013-10-315-16/+25
| |\ \ \
| | * | | KEYS: fix error return code in big_key_instantiate()Wei Yongjun2013-10-301-1/+3
| | * | | KEYS: Fix keyring quota misaccounting on key replacement and unlinkDavid Howells2013-10-301-12/+15
| | * | | KEYS: Fix a race between negating a key and reading the error setDavid Howells2013-10-303-2/+6
| | * | | KEYS: Make BIG_KEYS booleanJosh Boyer2013-10-301-1/+1
| * | | | apparmor: remove the "task" arg from may_change_ptraced_domain()Oleg Nesterov2013-10-291-8/+6
| * | | | apparmor: remove parent task info from audit loggingJohn Johansen2013-10-292-7/+0
| * | | | apparmor: remove tsk field from the apparmor_audit_structJohn Johansen2013-10-291-8/+2
| * | | | apparmor: fix capability to not use the current task, during reportingJohn Johansen2013-10-296-22/+15
| |/ / /
| * | | Merge branch 'smack-for-3.13' of git://git.gitorious.org/smack-next/kernel in...James Morris2013-10-304-9/+34
| |\ \ \
| | * | | Smack: Ptrace access check modeCasey Schaufler2013-10-281-1/+1
| | * | | Smack: Implement lock security modeCasey Schaufler2013-10-184-8/+33
| * | | | ima: provide hash algo info in the xattrDmitry Kasatkin2013-10-262-15/+59
| * | | | ima: enable support for larger default filedata hash algorithmsMimi Zohar2013-10-262-2/+59
| * | | | ima: define kernel parameter 'ima_template=' to change configured defaultRoberto Sassu2013-10-261-0/+31
| * | | | ima: add Kconfig default measurement list templateMimi Zohar2013-10-262-2/+27
| * | | | ima: defer determining the appraisal hash algorithm for 'ima' templateRoberto Sassu2013-10-261-1/+5
| * | | | ima: add audit log support for larger hashesMimi Zohar2013-10-261-1/+4
| * | | | ima: switch to new template management mechanismRoberto Sassu2013-10-255-97/+107
| * | | | ima: define new template ima-ng and template fields d-ng and n-ngRoberto Sassu2013-10-253-17/+150
| * | | | ima: define template fields library and new helpersRoberto Sassu2013-10-256-8/+242
| * | | | ima: new templates management mechanismRoberto Sassu2013-10-254-1/+146
View Lorry Controller Status