summaryrefslogtreecommitdiffstats
path: root/security/keys
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2016-01-174-10/+101
|\
| * Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2016-01-102-12/+8
| |\
| | * KEYS: refcount bug fixMimi Zohar2016-01-072-12/+8
| * | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2015-12-262-11/+51
| |\ \ | | |/
| | * KEYS: prevent keys from being removed from specified keyringsMimi Zohar2015-12-152-11/+51
| * | keys, trusted: seal with a TPM2 authorization policyJarkko Sakkinen2015-12-201-0/+26
| * | keys, trusted: select hash algorithm for TPM2 chipsJarkko Sakkinen2015-12-202-1/+27
| * | keys, trusted: fix: *do not* allow duplicate key optionsJarkko Sakkinen2015-12-201-0/+3
| |/
* | KEYS: Fix race between read and revokeDavid Howells2015-12-191-9/+9
* | KEYS: Fix handling of stored error in a negatively instantiated user keyDavid Howells2015-11-253-2/+10
|/
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2015-11-0513-88/+116
|\
| * KEYS: Merge the type-specific data with the payload dataDavid Howells2015-10-2112-66/+81
| * keys: Be more consistent in selection of union members usedInsu Yun2015-10-211-1/+1
| * KEYS: use kvfree() in add_keyGeliang Tang2015-10-211-7/+1
| * keys, trusted: seal/unseal with TPM 2.0 chipsJarkko Sakkinen2015-10-191-3/+33
| * keys, trusted: move struct trusted_key_options to trusted-type.hJarkko Sakkinen2015-10-191-11/+0
* | KEYS: Don't permit request_key() to construct a new keyringDavid Howells2015-10-191-0/+3
* | KEYS: Fix crash when attempt to garbage collect an uninstantiated keyringDavid Howells2015-10-151-2/+4
|/
* KEYS: Fix race between key destruction and finding a keyring by nameDavid Howells2015-09-251-4/+4
* capabilities: ambient capabilitiesAndy Lutomirski2015-09-041-0/+1
* KEYS: ensure we free the assoc array edit if edit is validColin Ian King2015-07-281-3/+5
* switch keyctl_instantiate_key_common() to iov_iterAl Viro2015-04-113-72/+40
* Don't leak a key reference if request_key() tries to use a revoked keyringDavid Jeffery2015-02-161-0/+1
* KEYS: Make /proc/keys unconditional if CONFIG_KEYS=yDavid Howells2015-01-222-26/+0
* KEYS: close race between key lookup and freeingSasha Levin2015-01-051-2/+2
* KEYS: remove a bogus NULL checkDan Carpenter2014-12-161-6/+4
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/li...James Morris2014-12-161-1/+4
|\
| * KEYS: Fix stale key registration at error pathTakashi Iwai2014-12-061-1/+4
| * Merge commit 'v3.17' into nextJames Morris2014-11-193-33/+5
| |\
* | | KEYS: request_key() should reget expired keys rather than give EKEYEXPIREDDavid Howells2014-12-013-2/+5
* | | KEYS: Simplify KEYRING_SEARCH_{NO,DO}_STATE_CHECK flagsDavid Howells2014-12-013-3/+6
* | | KEYS: Fix the size of the key description passed to/from userspaceDavid Howells2014-12-011-30/+26
* | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2014-10-1212-71/+82
|\ \ \ | |/ / | | / | |/ |/|
| * KEYS: Make the key matching functions return boolDavid Howells2014-09-163-8/+8
| * KEYS: Remove key_type::match in favour of overriding default by match_preparseDavid Howells2014-09-169-23/+15
| * KEYS: Remove key_type::def_lookup_typeDavid Howells2014-09-163-9/+5
| * KEYS: Preparse match dataDavid Howells2014-09-167-44/+65
| * Merge tag 'keys-next-fixes-20140916' into keys-nextDavid Howells2014-09-161-2/+2
| |\
| | * KEYS: Fix missing staticsDavid Howells2014-09-161-2/+2
| * | KEYS: Reinstate EPERM for a key type name beginning with a '.'David Howells2014-09-161-0/+2
| |/
* | KEYS: Increase root_maxkeys and root_maxbytes sizesSteve Dickson2014-09-031-2/+2
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2014-08-066-54/+145
|\ \ | |/
| * KEYS: revert encrypted key changeMimi Zohar2014-07-281-1/+1
| * 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-221-2/+4
| |\ \
| | * | 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
OpenPOWER on IntegriCloud