From 73e9cea380dbf51b738026202f97db2cb1eb4dda Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Mon, 10 Nov 2008 19:00:05 +0000
Subject: [PATCH] --- yaml --- r: 118641 b: refs/heads/master c:
 1f8f5cf6e4f038552a3e47b66085452c08556d71 h: refs/heads/master i:   118639:
 c06db399e6d3c90467f063d89bb95c2b82dadc79 v: v3

---
 [refs]                             | 2 +-
 trunk/security/keys/internal.h     | 1 +
 trunk/security/keys/process_keys.c | 2 +-
 trunk/security/keys/request_key.c  | 4 ++++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9e342e0f724c..dd750706238f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ad4f597058301c97f362e500a32f63f5c950a45
+refs/heads/master: 1f8f5cf6e4f038552a3e47b66085452c08556d71
diff --git a/trunk/security/keys/internal.h b/trunk/security/keys/internal.h
index b39f5c2e2c4b..239098f0fd76 100644
--- a/trunk/security/keys/internal.h
+++ b/trunk/security/keys/internal.h
@@ -107,6 +107,7 @@ extern key_ref_t search_process_keyrings(struct key_type *type,
 
 extern struct key *find_keyring_by_name(const char *name, bool skip_perm_check);
 
+extern int install_user_keyrings(struct task_struct *tsk);
 extern int install_thread_keyring(struct task_struct *tsk);
 extern int install_process_keyring(struct task_struct *tsk);
 
diff --git a/trunk/security/keys/process_keys.c b/trunk/security/keys/process_keys.c
index 5be6d018759a..45b240af6dbe 100644
--- a/trunk/security/keys/process_keys.c
+++ b/trunk/security/keys/process_keys.c
@@ -40,7 +40,7 @@ struct key_user root_key_user = {
 /*
  * install user and user session keyrings for a particular UID
  */
-static int install_user_keyrings(struct task_struct *tsk)
+int install_user_keyrings(struct task_struct *tsk)
 {
 	struct user_struct *user = tsk->user;
 	struct key *uid_keyring, *session_keyring;
diff --git a/trunk/security/keys/request_key.c b/trunk/security/keys/request_key.c
index ba32ca6469bd..abea08f87fe2 100644
--- a/trunk/security/keys/request_key.c
+++ b/trunk/security/keys/request_key.c
@@ -74,6 +74,10 @@ static int call_sbin_request_key(struct key_construction *cons,
 
 	kenter("{%d},{%d},%s", key->serial, authkey->serial, op);
 
+	ret = install_user_keyrings(tsk);
+	if (ret < 0)
+		goto error_alloc;
+
 	/* allocate a new session keyring */
 	sprintf(desc, "_req.%u", key->serial);