lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into next

Browse Source
This commit is contained in:
James Morris
2011-06-30 18:43:56 +10:00
parent 0e4ae0e0de c017d0d135
commit 5b944a71a1
813 changed files with 10217 additions and 4665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
security/keys/request_key.c
View File

@ -71,9 +71,8 @@ EXPORT_SYMBOL(complete_request_key);
* This is called in context of freshly forked kthread before kernel_execve(),
* so we can simply install the desired session_keyring at this point.
*/
static int umh_keys_init(struct subprocess_info *info)
static int umh_keys_init(struct subprocess_info *info, struct cred *cred)
{
struct cred *cred = (struct cred*)current_cred();
struct key *keyring = info->data;
return install_session_keyring_to_cred(cred, keyring);
@ -470,7 +469,7 @@ static struct key *construct_key_and_link(struct key_type *type,
} else if (ret == -EINPROGRESS) {
ret = 0;
} else {
key = ERR_PTR(ret);
goto couldnt_alloc_key;
}
key_put(dest_keyring);
@ -480,6 +479,7 @@ static struct key *construct_key_and_link(struct key_type *type,
construction_failed:
key_negate_and_link(key, key_negative_timeout, NULL, NULL);
key_put(key);
couldnt_alloc_key:
key_put(dest_keyring);
kleave(" = %d", ret);
return ERR_PTR(ret);