1 files changed, 7 insertions, 13 deletions

diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index d71056db7b67..4ad54eea1ea4 100644
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -834,23 +834,17 @@ error:
  * Replace a process's session keyring on behalf of one of its children when
  * the target  process is about to resume userspace execution.
  */
-void key_replace_session_keyring(void)
+void key_change_session_keyring(struct task_work *twork)
 {
-        const struct cred *old;
-        struct cred *new;
-
-        if (!current->replacement_session_keyring)
-                return;
+        const struct cred *old = current_cred();
+        struct cred *new = twork->data;
 
-        write_lock_irq(&tasklist_lock);
-        new = current->replacement_session_keyring;
-        current->replacement_session_keyring = NULL;
-        write_unlock_irq(&tasklist_lock);
-
-        if (!new)
+        kfree(twork);
+        if (unlikely(current->flags & PF_EXITING)) {
+                put_cred(new);
                 return;
+        }
 
-        old = current_cred();
         new->  uid      = old->  uid;
         new-> euid      = old-> euid;
         new-> suid      = old-> suid;