aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/binfmt_elf.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 8193d24be159..b8bca1ebc1a0 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -45,7 +45,8 @@
45 45
46static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs); 46static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs);
47static int load_elf_library(struct file *); 47static int load_elf_library(struct file *);
48static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int, unsigned long); 48static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
49 int, int, unsigned long);
49 50
50/* 51/*
51 * If we don't support core dumping, then supply a NULL so we 52 * If we don't support core dumping, then supply a NULL so we
@@ -435,7 +436,7 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
435 load_addr = -vaddr; 436 load_addr = -vaddr;
436 437
437 map_addr = elf_map(interpreter, load_addr + vaddr, 438 map_addr = elf_map(interpreter, load_addr + vaddr,
438 eppnt, elf_prot, elf_type, total_size); 439 eppnt, elf_prot, elf_type, total_size);
439 total_size = 0; 440 total_size = 0;
440 if (!*interp_map_addr) 441 if (!*interp_map_addr)
441 *interp_map_addr = map_addr; 442 *interp_map_addr = map_addr;
@@ -936,7 +937,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
936 } 937 }
937 938
938 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, 939 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
939 elf_prot, elf_flags,0); 940 elf_prot, elf_flags, 0);
940 if (BAD_ADDR(error)) { 941 if (BAD_ADDR(error)) {
941 send_sig(SIGKILL, current, 0); 942 send_sig(SIGKILL, current, 0);
942 retval = IS_ERR((void *)error) ? 943 retval = IS_ERR((void *)error) ?