Merge branch 'parisc-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux-2.6-microblaze.git] / fs / exec.c

diff --git a/fs/exec.c b/fs/exec.c
index a6f2c27..5d4d520 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -64,6 +64,7 @@
 #include <linux/compat.h>
 #include <linux/vmalloc.h>
 #include <linux/io_uring.h>
+#include <linux/syscall_user_dispatch.h>
 
 #include <linux/uaccess.h>
 #include <asm/mmu_context.h>
@@ -965,8 +966,8 @@ EXPORT_SYMBOL(read_code);
 
 /*
  * Maps the mm_struct mm into the current task struct.
- * On success, this function returns with the mutex
- * exec_update_mutex locked.
+ * On success, this function returns with exec_update_lock
+ * held for writing.
  */
 static int exec_mmap(struct mm_struct *mm)
 {
@@ -981,7 +982,7 @@ static int exec_mmap(struct mm_struct *mm)
        if (old_mm)
                sync_mm_rss(old_mm);
 
-       ret = mutex_lock_killable(&tsk->signal->exec_update_mutex);
+       ret = down_write_killable(&tsk->signal->exec_update_lock);
        if (ret)
                return ret;
 
@@ -995,7 +996,7 @@ static int exec_mmap(struct mm_struct *mm)
                mmap_read_lock(old_mm);
                if (unlikely(old_mm->core_state)) {
                        mmap_read_unlock(old_mm);
-                       mutex_unlock(&tsk->signal->exec_update_mutex);
+                       up_write(&tsk->signal->exec_update_lock);
                        return -EINTR;
                }
        }
@@ -1257,6 +1258,16 @@ int begin_new_exec(struct linux_binprm * bprm)
        if (retval)
                goto out;
 
+       /*
+        * Cancel any io_uring activity across execve
+        */
+       io_uring_task_cancel();
+
+       /* Ensure the files table is not shared. */
+       retval = unshare_files();
+       if (retval)
+               goto out;
+
        /*
         * Must be called _before_ exec_mmap() as bprm->mm is
         * not visibile until then. This also enables the update
@@ -1302,6 +1313,8 @@ int begin_new_exec(struct linux_binprm * bprm)
        flush_thread();
        me->personality &= ~bprm->per_clear;
 
+       clear_syscall_work_syscall_user_dispatch(me);
+
        /*
         * We have to apply CLOEXEC before we change whether the process is
         * dumpable (in setup_new_exec) to avoid a race with a process in userspace
@@ -1382,7 +1395,7 @@ int begin_new_exec(struct linux_binprm * bprm)
        return 0;
 
 out_unlock:
-       mutex_unlock(&me->signal->exec_update_mutex);
+       up_write(&me->signal->exec_update_lock);
 out:
        return retval;
 }
@@ -1423,7 +1436,7 @@ void setup_new_exec(struct linux_binprm * bprm)
         * some architectures like powerpc
         */
        me->mm->task_size = TASK_SIZE;
-       mutex_unlock(&me->signal->exec_update_mutex);
+       up_write(&me->signal->exec_update_lock);
        mutex_unlock(&me->signal->cred_guard_mutex);
 }
 EXPORT_SYMBOL(setup_new_exec);
@@ -1776,21 +1789,11 @@ static int bprm_execve(struct linux_binprm *bprm,
                       int fd, struct filename *filename, int flags)
 {
        struct file *file;
-       struct files_struct *displaced;
        int retval;
 
-       /*
-        * Cancel any io_uring activity across execve
-        */
-       io_uring_task_cancel();
-
-       retval = unshare_files(&displaced);
-       if (retval)
-               return retval;
-
        retval = prepare_bprm_creds(bprm);
        if (retval)
-               goto out_files;
+               return retval;
 
        check_unsafe_exec(bprm);
        current->in_execve = 1;
@@ -1805,11 +1808,14 @@ static int bprm_execve(struct linux_binprm *bprm,
        bprm->file = file;
        /*
         * Record that a name derived from an O_CLOEXEC fd will be
-        * inaccessible after exec. Relies on having exclusive access to
-        * current->files (due to unshare_files above).
+        * inaccessible after exec.  This allows the code in exec to
+        * choose to fail when the executable is not mmaped into the
+        * interpreter and an open file descriptor is not passed to
+        * the interpreter.  This makes for a better user experience
+        * than having the interpreter start and then immediately fail
+        * when it finds the executable is inaccessible.
         */
-       if (bprm->fdpath &&
-           close_on_exec(fd, rcu_dereference_raw(current->files->fdt)))
+       if (bprm->fdpath && get_close_on_exec(fd))
                bprm->interp_flags |= BINPRM_FLAGS_PATH_INACCESSIBLE;
 
        /* Set the unchanging part of bprm->cred */
@@ -1827,8 +1833,6 @@ static int bprm_execve(struct linux_binprm *bprm,
        rseq_execve(current);
        acct_update_integrals(current);
        task_numa_free(current, false);
-       if (displaced)
-               put_files_struct(displaced);
        return retval;
 
 out:
@@ -1845,10 +1849,6 @@ out_unmark:
        current->fs->in_exec = 0;
        current->in_execve = 0;
 
-out_files:
-       if (displaced)
-               reset_files_struct(displaced);
-
        return retval;
 }