---

yaml --- r: 264505 b: refs/heads/master c: 3ecf1b4 h: refs/heads/master i: 264503: 54fe854 v: v3
git-mirror · Aug 22, 2011 · b73a5b7 · b73a5b7
1 parent 6773e0c
commit b73a5b7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 995995378f996a8aa1cf4e4ddc0f79fbfd45496f
+refs/heads/master: 3ecf1b4f347210e39b156177e5b8a26ff8d00279
diff --git a/trunk/security/keys/process_keys.c b/trunk/security/keys/process_keys.c
@@ -589,12 +589,22 @@ key_ref_t lookup_user_key(key_serial_t id, unsigned long lflags,
 			ret = install_user_keyrings();
 			if (ret < 0)
 				goto error;
-			ret = install_session_keyring(
-				cred->user->session_keyring);
+			if (lflags & KEY_LOOKUP_CREATE)
+				ret = join_session_keyring(NULL);
+			else
+				ret = install_session_keyring(
+					cred->user->session_keyring);
 
 			if (ret < 0)
 				goto error;
 			goto reget_creds;
+		} else if (cred->tgcred->session_keyring ==
+			   cred->user->session_keyring &&
+			   lflags & KEY_LOOKUP_CREATE) {
+			ret = join_session_keyring(NULL);
+			if (ret < 0)
+				goto error;
+			goto reget_creds;
 		}
 
 		rcu_read_lock();