summaryrefslogtreecommitdiffstats
path: root/security/keys
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into for-nextJiri Kosina2012-10-2813-195/+225
|\
| * Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-10-147-63/+129
| |\
| | * KEYS: Add payload preparsing opportunity prior to key instantiate or updateDavid Howells2012-10-087-63/+129
| * | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2012-10-021-42/+12
| |\ \
| | * | tpm: Move tpm_get_random api into the TPM device driverKent Yoder2012-08-221-42/+12
| | |/
| * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi...Linus Torvalds2012-10-028-83/+79
| |\ \
| | * | userns: Convert security/keys to the new userns infrastructureEric W. Biederman2012-09-138-83/+79
| | |/
| * | Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wqLinus Torvalds2012-10-022-5/+5
| |\ \
| | * | workqueue: deprecate system_nrt[_freezable]_wqTejun Heo2012-08-202-5/+5
| | |/
| * / task_work: Revert "hold task_lock around checks in keyctl"Oleg Nesterov2012-09-131-2/+0
| |/
* / keys: Fix unreachable codeAlan Cox2012-10-251-2/+0
|/
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2012-07-234-4/+6
|\
| * Merge commit 'v3.5-rc2' into nextJames Morris2012-06-107-68/+55
| |\
| * | KEYS: Fix some sparse warningsDavid Howells2012-05-254-4/+6
* | | hold task_lock around checks in keyctlAl Viro2012-07-221-0/+2
* | | merge task_work and rcu_head, get rid of separate allocation for keyring caseAl Viro2012-07-223-28/+12
* | | trimming task_work: kill ->dataAl Viro2012-07-223-8/+15
| |/ |/|
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-05-313-51/+44
|\ \
| * | keys: change keyctl_session_to_parent() to use task_work_add()Oleg Nesterov2012-05-233-41/+44
| * | TIF_NOTIFY_RESUME is defined on all targets nowAl Viro2012-05-231-10/+0
* | | aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()Christopher Yeoh2012-05-312-2/+2
* | | kmod: convert two call sites to call_usermodehelper_fns()Boaz Harrosh2012-05-311-10/+3
* | | security/keys/keyctl.c: suppress memory allocation failure warningAndrew Morton2012-05-311-1/+1
|/ /
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi...Linus Torvalds2012-05-233-4/+5
|\ \ | |/ |/|
| * userns: Convert group_info values from gid_t to kgid_t.Eric W. Biederman2012-05-031-1/+2
| * cred: Refcount the user_ns pointed to by the cred.Eric W. Biederman2012-04-071-1/+1
| * userns: Use cred->user_ns instead of cred->user->user_nsEric W. Biederman2012-04-073-3/+3
* | KEYS: Don't check for NULL key pointer in key_validate()David Howells2012-05-161-24/+16
* | KEYS: Add invalidation supportDavid Howells2012-05-118-28/+110
* | KEYS: Do LRU discard in full keyringsDavid Howells2012-05-112-7/+42
* | KEYS: Permit in-place link replacement in keyring listDavid Howells2012-05-112-40/+57
* | KEYS: Perform RCU synchronisation on keys prior to key destructionDavid Howells2012-05-111-29/+44
* | KEYS: Announce key type (un)registrationDavid Howells2012-05-111-0/+3
* | KEYS: Reorganise keys MakefileDavid Howells2012-05-111-3/+9
* | KEYS: Move the key config into security/keys/KconfigDavid Howells2012-05-111-0/+71
|/
* usermodehelper: kill umh_wait, renumber UMH_* constantsOleg Nesterov2012-03-231-1/+1
* Merge tag 'nfs-for-3.4-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2012-03-232-16/+22
|\
| * Created a function for setting timeouts on keysBryan Schumaker2012-03-012-16/+22
* | KEYS: testing wrong bit for KEY_FLAG_REVOKEDDan Carpenter2012-03-071-1/+2
* | Merge branch 'next-queue' into nextJames Morris2012-02-091-1/+14
|\ \ | |/ |/|
| * KEYS: Allow special keyrings to be clearedDavid Howells2012-01-191-1/+14
* | Merge git://git.samba.org/sfrench/cifs-2.6Linus Torvalds2012-01-233-0/+39
|\ \
| * | keys: add a "logon" key typeJeff Layton2012-01-173-0/+39
| |/
* | keys: fix user_defined key sparse messagesMimi Zohar2012-01-191-3/+3
* | encrypted-keys: fix rcu and sparse messagesMimi Zohar2012-01-182-2/+2
* | keys: fix trusted/encrypted keys sparse rcu_assign_pointer messagesMimi Zohar2012-01-183-4/+6
* | KEYS: Add missing smp_rmb() primitives to the keyring search codeDavid Howells2012-01-182-8/+18
|/
* Merge branch 'next' into for-linusJames Morris2012-01-091-0/+3
|\
| * KEYS: Give key types their own lockdep class for key->semDavid Howells2011-11-171-0/+3
* | encrypted-keys: module build fixesMimi Zohar2011-11-162-3/+8