Merge tag 'powerpc-5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

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

diff --git a/fs/exec.c b/fs/exec.c
index d4fb18b..547a239 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -23,6 +23,7 @@
  * formats.
  */
 
+#include <linux/kernel_read_file.h>
 #include <linux/slab.h>
 #include <linux/file.h>
 #include <linux/fdtable.h>
@@ -62,6 +63,7 @@
 #include <linux/oom.h>
 #include <linux/compat.h>
 #include <linux/vmalloc.h>
+#include <linux/io_uring.h>
 
 #include <linux/uaccess.h>
 #include <asm/mmu_context.h>
@@ -949,137 +951,6 @@ struct file *open_exec(const char *name)
 }
 EXPORT_SYMBOL(open_exec);
 
-int kernel_read_file(struct file *file, void **buf, loff_t *size,
-                    loff_t max_size, enum kernel_read_file_id id)
-{
-       loff_t i_size, pos;
-       ssize_t bytes = 0;
-       int ret;
-
-       if (!S_ISREG(file_inode(file)->i_mode) || max_size < 0)
-               return -EINVAL;
-
-       ret = deny_write_access(file);
-       if (ret)
-               return ret;
-
-       ret = security_kernel_read_file(file, id);
-       if (ret)
-               goto out;
-
-       i_size = i_size_read(file_inode(file));
-       if (i_size <= 0) {
-               ret = -EINVAL;
-               goto out;
-       }
-       if (i_size > SIZE_MAX || (max_size > 0 && i_size > max_size)) {
-               ret = -EFBIG;
-               goto out;
-       }
-
-       if (id != READING_FIRMWARE_PREALLOC_BUFFER)
-               *buf = vmalloc(i_size);
-       if (!*buf) {
-               ret = -ENOMEM;
-               goto out;
-       }
-
-       pos = 0;
-       while (pos < i_size) {
-               bytes = kernel_read(file, *buf + pos, i_size - pos, &pos);
-               if (bytes < 0) {
-                       ret = bytes;
-                       goto out_free;
-               }
-
-               if (bytes == 0)
-                       break;
-       }
-
-       if (pos != i_size) {
-               ret = -EIO;
-               goto out_free;
-       }
-
-       ret = security_kernel_post_read_file(file, *buf, i_size, id);
-       if (!ret)
-               *size = pos;
-
-out_free:
-       if (ret < 0) {
-               if (id != READING_FIRMWARE_PREALLOC_BUFFER) {
-                       vfree(*buf);
-                       *buf = NULL;
-               }
-       }
-
-out:
-       allow_write_access(file);
-       return ret;
-}
-EXPORT_SYMBOL_GPL(kernel_read_file);
-
-int kernel_read_file_from_path(const char *path, void **buf, loff_t *size,
-                              loff_t max_size, enum kernel_read_file_id id)
-{
-       struct file *file;
-       int ret;
-
-       if (!path || !*path)
-               return -EINVAL;
-
-       file = filp_open(path, O_RDONLY, 0);
-       if (IS_ERR(file))
-               return PTR_ERR(file);
-
-       ret = kernel_read_file(file, buf, size, max_size, id);
-       fput(file);
-       return ret;
-}
-EXPORT_SYMBOL_GPL(kernel_read_file_from_path);
-
-int kernel_read_file_from_path_initns(const char *path, void **buf,
-                                     loff_t *size, loff_t max_size,
-                                     enum kernel_read_file_id id)
-{
-       struct file *file;
-       struct path root;
-       int ret;
-
-       if (!path || !*path)
-               return -EINVAL;
-
-       task_lock(&init_task);
-       get_fs_root(init_task.fs, &root);
-       task_unlock(&init_task);
-
-       file = file_open_root(root.dentry, root.mnt, path, O_RDONLY, 0);
-       path_put(&root);
-       if (IS_ERR(file))
-               return PTR_ERR(file);
-
-       ret = kernel_read_file(file, buf, size, max_size, id);
-       fput(file);
-       return ret;
-}
-EXPORT_SYMBOL_GPL(kernel_read_file_from_path_initns);
-
-int kernel_read_file_from_fd(int fd, void **buf, loff_t *size, loff_t max_size,
-                            enum kernel_read_file_id id)
-{
-       struct fd f = fdget(fd);
-       int ret = -EBADF;
-
-       if (!f.file)
-               goto out;
-
-       ret = kernel_read_file(f.file, buf, size, max_size, id);
-out:
-       fdput(f);
-       return ret;
-}
-EXPORT_SYMBOL_GPL(kernel_read_file_from_fd);
-
 #if defined(CONFIG_HAVE_AOUT) || defined(CONFIG_BINFMT_FLAT) || \
     defined(CONFIG_BINFMT_ELF_FDPIC)
 ssize_t read_code(struct file *file, unsigned long addr, loff_t pos, size_t len)
@@ -1908,6 +1779,11 @@ static int bprm_execve(struct linux_binprm *bprm,
        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;