aboutsummaryrefslogtreecommitdiffstats
path: root/security/keys/request_key.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-23 02:55:47 -0500
committerIngo Molnar <mingo@elte.hu>2008-11-23 02:55:47 -0500
commitca9eed76133c00e7f4b1eeb4c1a6cb800cd2654c (patch)
tree5f011f4bd00c921e41605b1915c227aeaf411a0d /security/keys/request_key.c
parent8652cb4b0d87accbe78725fd2a13be2787059649 (diff)
parent13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff)
Merge commit 'v2.6.28-rc6' into x86/debug
Diffstat (limited to 'security/keys/request_key.c')
-rw-r--r--security/keys/request_key.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index ba32ca6469bd..abea08f87fe2 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
@@ -74,6 +74,10 @@ static int call_sbin_request_key(struct key_construction *cons,
74 74
75 kenter("{%d},{%d},%s", key->serial, authkey->serial, op); 75 kenter("{%d},{%d},%s", key->serial, authkey->serial, op);
76 76
77 ret = install_user_keyrings(tsk);
78 if (ret < 0)
79 goto error_alloc;
80
77 /* allocate a new session keyring */ 81 /* allocate a new session keyring */
78 sprintf(desc, "_req.%u", key->serial); 82 sprintf(desc, "_req.%u", key->serial);
79 83