Merge tag 'samsung-fixes-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / fs / binfmt_flat.c

diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index eb747a2..9b2917a 100644 (file)
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -34,6 +34,7 @@
 #include <linux/init.h>
 #include <linux/flat.h>
 #include <linux/uaccess.h>
+#include <linux/vmalloc.h>
 
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
@@ -537,7 +538,7 @@ static int load_flat_file(struct linux_binprm *bprm,
         * case,  and then the fully copied to RAM case which lumps
         * it all together.
         */
-       if ((flags & (FLAT_FLAG_RAM|FLAT_FLAG_GZIP)) == 0) {
+       if (!IS_ENABLED(CONFIG_MMU) && !(flags & (FLAT_FLAG_RAM|FLAT_FLAG_GZIP))) {
                /*
                 * this should give us a ROM ptr,  but if it doesn't we don't
                 * really care
@@ -628,6 +629,7 @@ static int load_flat_file(struct linux_binprm *bprm,
                 * load it all in and treat it like a RAM load from now on
                 */
                if (flags & FLAT_FLAG_GZIP) {
+#ifndef CONFIG_MMU
                        result = decompress_exec(bprm, sizeof(struct flat_hdr),
                                         (((char *)textpos) + sizeof(struct flat_hdr)),
                                         (text_len + full_data
@@ -635,13 +637,51 @@ static int load_flat_file(struct linux_binprm *bprm,
                                         0);
                        memmove((void *) datapos, (void *) realdatastart,
                                        full_data);
+#else
+                       /*
+                        * This is used on MMU systems mainly for testing.
+                        * Let's use a kernel buffer to simplify things.
+                        */
+                       long unz_text_len = text_len - sizeof(struct flat_hdr);
+                       long unz_len = unz_text_len + full_data;
+                       char *unz_data = vmalloc(unz_len);
+                       if (!unz_data) {
+                               result = -ENOMEM;
+                       } else {
+                               result = decompress_exec(bprm, sizeof(struct flat_hdr),
+                                                        unz_data, unz_len, 0);
+                               if (result == 0 &&
+                                   (copy_to_user((void __user *)textpos + sizeof(struct flat_hdr),
+                                                 unz_data, unz_text_len) ||
+                                    copy_to_user((void __user *)datapos,
+                                                 unz_data + unz_text_len, full_data)))
+                                       result = -EFAULT;
+                               vfree(unz_data);
+                       }
+#endif
                } else if (flags & FLAT_FLAG_GZDATA) {
                        result = read_code(bprm->file, textpos, 0, text_len);
-                       if (!IS_ERR_VALUE(result))
+                       if (!IS_ERR_VALUE(result)) {
+#ifndef CONFIG_MMU
                                result = decompress_exec(bprm, text_len, (char *) datapos,
                                                 full_data, 0);
-               } else
+#else
+                               char *unz_data = vmalloc(full_data);
+                               if (!unz_data) {
+                                       result = -ENOMEM;
+                               } else {
+                                       result = decompress_exec(bprm, text_len,
+                                                      unz_data, full_data, 0);
+                                       if (result == 0 &&
+                                           copy_to_user((void __user *)datapos,
+                                                        unz_data, full_data))
+                                               result = -EFAULT;
+                                       vfree(unz_data);
+                               }
 #endif
+                       }
+               } else
+#endif /* CONFIG_BINFMT_ZFLAT */
                {
                        result = read_code(bprm->file, textpos, 0, text_len);
                        if (!IS_ERR_VALUE(result))
@@ -677,7 +717,9 @@ static int load_flat_file(struct linux_binprm *bprm,
                 */
                current->mm->start_brk = datapos + data_len + bss_len;
                current->mm->brk = (current->mm->start_brk + 3) & ~3;
+#ifndef CONFIG_MMU
                current->mm->context.end_brk = memp + memp_size - stack_len;
+#endif
        }
 
        if (flags & FLAT_FLAG_KTRACE) {
@@ -870,7 +912,7 @@ static int load_flat_binary(struct linux_binprm *bprm)
 {
        struct lib_info libinfo;
        struct pt_regs *regs = current_pt_regs();
-       unsigned long stack_len;
+       unsigned long stack_len = 0;
        unsigned long start_addr;
        int res;
        int i, j;
@@ -884,7 +926,9 @@ static int load_flat_binary(struct linux_binprm *bprm)
         * pedantic and include space for the argv/envp array as it may have
         * a lot of entries.
         */
-       stack_len = PAGE_SIZE * MAX_ARG_PAGES - bprm->p;  /* the strings */
+#ifndef CONFIG_MMU
+       stack_len += PAGE_SIZE * MAX_ARG_PAGES - bprm->p; /* the strings */
+#endif
        stack_len += (bprm->argc + 1) * sizeof(char *);   /* the argv array */
        stack_len += (bprm->envc + 1) * sizeof(char *);   /* the envp array */
        stack_len = ALIGN(stack_len, FLAT_STACK_ALIGN);
@@ -894,17 +938,29 @@ static int load_flat_binary(struct linux_binprm *bprm)
                return res;
 
        /* Update data segment pointers for all libraries */
-       for (i = 0; i < MAX_SHARED_LIBS; i++)
-               if (libinfo.lib_list[i].loaded)
-                       for (j = 0; j < MAX_SHARED_LIBS; j++)
-                               (-(j+1))[(unsigned long *)(libinfo.lib_list[i].start_data)] =
-                                       (libinfo.lib_list[j].loaded) ?
-                                               libinfo.lib_list[j].start_data : UNLOADED_LIB;
+       for (i = 0; i < MAX_SHARED_LIBS; i++) {
+               if (!libinfo.lib_list[i].loaded)
+                       continue;
+               for (j = 0; j < MAX_SHARED_LIBS; j++) {
+                       unsigned long val = libinfo.lib_list[j].loaded ?
+                               libinfo.lib_list[j].start_data : UNLOADED_LIB;
+                       unsigned long __user *p = (unsigned long __user *)
+                               libinfo.lib_list[i].start_data;
+                       p -= j + 1;
+                       if (put_user(val, p))
+                               return -EFAULT;
+               }
+       }
 
        install_exec_creds(bprm);
 
        set_binfmt(&flat_format);
 
+#ifdef CONFIG_MMU
+       res = setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT);
+       if (!res)
+               res = create_flat_tables(bprm, bprm->p);
+#else
        /* Stash our initial stack pointer into the mm structure */
        current->mm->start_stack =
                ((current->mm->context.end_brk + stack_len + 3) & ~3) - 4;
@@ -914,6 +970,7 @@ static int load_flat_binary(struct linux_binprm *bprm)
        res = transfer_args_to_stack(bprm, &current->mm->start_stack);
        if (!res)
                res = create_flat_tables(bprm, current->mm->start_stack);
+#endif
        if (res)
                return res;