Merge branch 'linus' into timers/urgent

Get upstream changes so we can apply fixes against them

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 9 insertions, 8 deletions

diff --git a/fs/exec.c b/fs/exec.c
index ffd7a813ad3d..9c73def87642 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -110,13 +110,14 @@ SYSCALL_DEFINE1(uselib, const char __user *, library)
         static const struct open_flags uselib_flags = {
                 .open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC,
                 .acc_mode = MAY_READ | MAY_EXEC | MAY_OPEN,
-                .intent = LOOKUP_OPEN
+                .intent = LOOKUP_OPEN,
+                .lookup_flags = LOOKUP_FOLLOW,
         };
 
         if (IS_ERR(tmp))
                 goto out;
 
-        file = do_filp_open(AT_FDCWD, tmp, &uselib_flags, LOOKUP_FOLLOW);
+        file = do_filp_open(AT_FDCWD, tmp, &uselib_flags);
         putname(tmp);
         error = PTR_ERR(file);
         if (IS_ERR(file))
@@ -756,10 +757,11 @@ struct file *open_exec(const char *name)
         static const struct open_flags open_exec_flags = {
                 .open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC,
                 .acc_mode = MAY_EXEC | MAY_OPEN,
-                .intent = LOOKUP_OPEN
+                .intent = LOOKUP_OPEN,
+                .lookup_flags = LOOKUP_FOLLOW,
         };
 
-        file = do_filp_open(AT_FDCWD, &tmp, &open_exec_flags, LOOKUP_FOLLOW);
+        file = do_filp_open(AT_FDCWD, &tmp, &open_exec_flags);
         if (IS_ERR(file))
                 goto out;
 
@@ -930,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));
@@ -945,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);
 
@@ -1463,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
@@ -1472,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;
         }