summaryrefslogtreecommitdiffstats
path: root/security/keys/request_key.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2006-06-23 22:46:23 +0200
committerTony Luck <tony.luck@intel.com>2006-06-23 22:46:23 +0200
commit8cf60e04a131310199d5776e2f9e915f0c468899 (patch)
tree373a68e88e6737713a0a5723d552cdeefffff929 /security/keys/request_key.c
parentPull rework-memory-attribute-aliasing into release branch (diff)
parent[PATCH] fix silly ARM non-EABI build error (diff)
downloadlinux-8cf60e04a131310199d5776e2f9e915f0c468899.tar.xz
linux-8cf60e04a131310199d5776e2f9e915f0c468899.zip
Auto-update from upstream
Diffstat (limited to 'security/keys/request_key.c')
-rw-r--r--security/keys/request_key.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index f030a0ccbb93..eab66a06ca53 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -48,7 +48,8 @@ static int call_sbin_request_key(struct key *key,
/* allocate a new session keyring */
sprintf(desc, "_req.%u", key->serial);
- keyring = keyring_alloc(desc, current->fsuid, current->fsgid, 1, NULL);
+ keyring = keyring_alloc(desc, current->fsuid, current->fsgid,
+ current, 1, NULL);
if (IS_ERR(keyring)) {
ret = PTR_ERR(keyring);
goto error_alloc;
@@ -137,7 +138,8 @@ static struct key *__request_key_construction(struct key_type *type,
/* create a key and add it to the queue */
key = key_alloc(type, description,
- current->fsuid, current->fsgid, KEY_POS_ALL, 0);
+ current->fsuid, current->fsgid,
+ current, KEY_POS_ALL, 0);
if (IS_ERR(key))
goto alloc_failed;