binfmt_elf: Don't clobber passed executable's file header

[pandora-kernel.git] / fs / binfmt_elf.c

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index d252462..0f3bbea 100644 (file)
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -671,16 +671,16 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
                         */
                        would_dump(bprm, interpreter);
 
                         */
                        would_dump(bprm, interpreter);
 

-                       retval = kernel_read(interpreter, 0, bprm->buf,
-                                            BINPRM_BUF_SIZE);
-                       if (retval != BINPRM_BUF_SIZE) {
+                       /* Get the exec headers */
+                       retval = kernel_read(interpreter, 0,
+                                            (void *)&loc->interp_elf_ex,
+                                            sizeof(loc->interp_elf_ex));
+                       if (retval != sizeof(loc->interp_elf_ex)) {

                                if (retval >= 0)
                                        retval = -EIO;
                                goto out_free_dentry;
                        }
 
                                if (retval >= 0)
                                        retval = -EIO;
                                goto out_free_dentry;
                        }
 

-                       /* Get the exec headers */
-                       loc->interp_elf_ex = *((struct elfhdr *)bprm->buf);

                        break;
                }
                elf_ppnt++;
                        break;
                }
                elf_ppnt++;