Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / fs / binfmt_elf_fdpic.c

diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index c4565061da84c55f9850f6d393cf3bce5816d4cf..429326b6e2e7088dc1c67c770122beb7b004152b 100644 (file)
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -378,6 +378,11 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm)
                                 executable_stack);
        if (retval < 0)
                goto error;
+#ifdef ARCH_HAS_SETUP_ADDITIONAL_PAGES
+       retval = arch_setup_additional_pages(bprm, !!interpreter_name);
+       if (retval < 0)
+               goto error;
+#endif
 #endif
 
        /* load the executable and interpreter into memory */
@@ -831,6 +836,9 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,
                        if (phdr->p_vaddr >= seg->p_vaddr &&
                            phdr->p_vaddr + phdr->p_memsz <=
                            seg->p_vaddr + seg->p_memsz) {
+                               Elf32_Dyn __user *dyn;
+                               Elf32_Sword d_tag;
+
                                params->dynamic_addr =
                                        (phdr->p_vaddr - seg->p_vaddr) +
                                        seg->addr;
@@ -843,8 +851,9 @@ static int elf_fdpic_map_file(struct elf_fdpic_params *params,
                                        goto dynamic_error;
 
                                tmp = phdr->p_memsz / sizeof(Elf32_Dyn);
-                               if (((Elf32_Dyn *)
-                                    params->dynamic_addr)[tmp - 1].d_tag != 0)
+                               dyn = (Elf32_Dyn __user *)params->dynamic_addr;
+                               __get_user(d_tag, &dyn[tmp - 1].d_tag);
+                               if (d_tag != 0)
                                        goto dynamic_error;
                                break;
                        }