summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'keys-fixes' into keys-nextDavid Howells2014-07-221-1/+14
|\
| * KEYS: Allow special keys (eg. DNS results) to be invalidated by CAP_SYS_ADMINDavid Howells2014-07-171-1/+14
* | Merge remote-tracking branch 'integrity/next-with-keys' into keys-nextDavid Howells2014-07-226-4/+67
|\ \
| * | ima: define '.ima' as a builtin 'trusted' keyringMimi Zohar2014-07-175-2/+63
| * | KEYS: special dot prefixed keyring name bug fixMimi Zohar2014-07-171-2/+4
* | | KEYS: request_key_auth: Provide key preparsingDavid Howells2014-07-221-0/+13
* | | KEYS: keyring: Provide key preparsingDavid Howells2014-07-221-11/+23
* | | KEYS: big_key: Use key preparsingDavid Howells2014-07-221-16/+25
* | | KEYS: user: Use key preparsingDavid Howells2014-07-221-19/+22
* | | KEYS: Call ->free_preparse() even after ->preparse() returns an errorDavid Howells2014-07-221-5/+4
* | | KEYS: Allow expiry time to be set when preparsing a keyDavid Howells2014-07-221-0/+8
* | | KEYS: struct key_preparsed_payload should have two payload pointersDavid Howells2014-07-222-3/+5
* | | KEYS: Provide a generic instantiation functionDavid Howells2014-07-181-0/+30
|/ /
* | ima: provide double buffering for hash calculationDmitry Kasatkin2014-07-171-16/+49
* | ima: introduce multi-page collect buffersDmitry Kasatkin2014-07-171-2/+96
* | ima: use ahash API for file hash calculationDmitry Kasatkin2014-07-171-4/+183
* | audit: fix dangling keywords in integrity ima message outputRichard Guy Briggs2014-07-172-4/+4
* | ima: delay template descriptor lookup until useDmitry Kasatkin2014-07-171-1/+2
* | ima: remove unnecessary i_mutex locking from ima_rdwr_violation_check()Dmitry Kasatkin2014-07-171-4/+0
|/
* Merge branch 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux i...James Morris2014-07-171-2/+11
|\
| * selinux: fix the default socket labeling in sock_graft()Paul Moore2014-07-101-2/+11
| * Merge tag 'v3.15' into nextPaul Moore2014-06-1734-235/+376
| |\
| * | selinux: conditionally reschedule in hashtab_insert while loading selinux policyDave Jones2014-05-151-0/+3
| * | selinux: conditionally reschedule in mls_convert_context while loading selinu...Dave Jones2014-05-151-0/+2
| * | selinux: reject setexeccon() on MNT_NOSUID applications with -EACCESPaul Moore2014-05-151-2/+4
| * | selinux: Report permissive mode in avc: denied messages.Stephen Smalley2014-05-013-5/+11
| * | Merge tag 'v3.14' into nextPaul Moore2014-03-3117-158/+260
| |\ \
| * | | selinux: correctly label /proc inodes in use before the policy is loadedPaul Moore2014-03-051-9/+27
| * | | selinux: put the mmap() DAC controls before the MAC controlsPaul Moore2014-02-281-12/+8
| * | | Merge tag 'v3.13' into nextPaul Moore2014-01-2354-1239/+2802
| |\ \ \
* | \ \ \ Merge branch 'serge-next-2' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2014-06-137-28/+114
|\ \ \ \ \
| * | | | | ima: introduce ima_kernel_read()Dmitry Kasatkin2014-06-121-1/+31
| * | | | | evm: prohibit userspace writing 'security.evm' HMAC valueMimi Zohar2014-06-121-2/+10
| * | | | | ima: check inode integrity cache in violation checkDmitry Kasatkin2014-06-121-2/+7
| * | | | | ima: prevent unnecessary policy checkingDmitry Kasatkin2014-06-121-9/+4
| * | | | | evm: provide option to protect additional SMACK xattrsDmitry Kasatkin2014-06-122-0/+22
| * | | | | evm: replace HMAC version with attribute maskDmitry Kasatkin2014-06-124-11/+33
| * | | | | ima: prevent new digsig xattr from being replacedMimi Zohar2014-06-121-3/+7
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-06-121-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-05-243-58/+159
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-05-121-3/+3
| |\ \ \ \ \
| * | | | | | audit: add netlink audit protocol bind to check capabilities on multicast joinRichard Guy Briggs2014-04-221-1/+1
* | | | | | | Merge branch 'serge-next-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2014-06-1023-133/+382
|\ \ \ \ \ \ \
| * | | | | | | ima: audit log files opened with O_DIRECT flagMimi Zohar2014-06-034-3/+19
| * | | | | | | selinux: conditionally reschedule in hashtab_insert while loading selinux policyDave Jones2014-06-031-0/+3
| * | | | | | | selinux: conditionally reschedule in mls_convert_context while loading selinu...Dave Jones2014-06-031-0/+2
| * | | | | | | selinux: reject setexeccon() on MNT_NOSUID applications with -EACCESPaul Moore2014-06-031-2/+4
| * | | | | | | selinux: Report permissive mode in avc: denied messages.Stephen Smalley2014-06-033-5/+11
| * | | | | | | Merge branch 'smack-for-3.16' of git://git.gitorious.org/smack-next/kernel in...James Morris2014-05-204-73/+297
| |\ \ \ \ \ \ \
| | * | | | | | | Warning in scanf string typingToralf Förster2014-05-061-1/+1
OpenPOWER on IntegriCloud