1 files changed, 13 insertions, 3 deletions

diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index a3063eb3dc23..1068cb1939b3 100644
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -270,7 +270,7 @@ static int install_session_keyring(struct key *keyring)
         if (!new)
                 return -ENOMEM;
 
-        ret = install_session_keyring_to_cred(new, NULL);
+        ret = install_session_keyring_to_cred(new, keyring);
         if (ret < 0) {
                 abort_creds(new);
                 return ret;
@@ -589,12 +589,22 @@ try_again:
                         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();