1 files changed, 3 insertions, 4 deletions

diff --git a/fs/exec.c b/fs/exec.c
index 03b907cfd765..9c73def87642 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -932,6 +932,7 @@ static int de_thread(struct task_struct *tsk)
                  * also take its birthdate (always earlier than our own).
                  */
                 tsk->start_time = leader->start_time;
+                tsk->real_start_time = leader->real_start_time;
 
                 BUG_ON(!same_thread_group(leader, tsk));
                 BUG_ON(has_group_leader_pid(tsk));
@@ -947,9 +948,8 @@ static int de_thread(struct task_struct *tsk)
                  * Note: The old leader also uses this pid until release_task
                  *       is called.  Odd but simple and correct.
                  */
-                detach_pid(tsk, PIDTYPE_PID);
                 tsk->pid = leader->pid;
-                attach_pid(tsk, PIDTYPE_PID,  task_pid(leader));
+                change_pid(tsk, PIDTYPE_PID, task_pid(leader));
                 transfer_pid(leader, tsk, PIDTYPE_PGID);
                 transfer_pid(leader, tsk, PIDTYPE_SID);
 
@@ -1465,7 +1465,6 @@ static int do_execve_common(const char *filename,
         struct files_struct *displaced;
         bool clear_in_exec;
         int retval;
-        const struct cred *cred = current_cred();
 
         /*
          * We move the actual failure in case of RLIMIT_NPROC excess from
@@ -1474,7 +1473,7 @@ static int do_execve_common(const char *filename,
          * whether NPROC limit is still exceeded.
          */
         if ((current->flags & PF_NPROC_EXCEEDED) &&
-            atomic_read(&cred->user->processes) > rlimit(RLIMIT_NPROC)) {
+            atomic_read(&current_user()->processes) > rlimit(RLIMIT_NPROC)) {
                 retval = -EAGAIN;
                 goto out_ret;
         }