diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /fs/binfmt_elf.c | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'fs/binfmt_elf.c')
| -rw-r--r-- | fs/binfmt_elf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 861ede356..c84164fc4 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -247,7 +247,7 @@ static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex, goto out; if (!elf_check_arch(interp_elf_ex)) goto out; - if (!interpreter->f_op->mmap) + if (!interpreter->f_op || !interpreter->f_op->mmap) goto out; /* @@ -364,7 +364,7 @@ static unsigned long load_aout_interp(struct exec * interp_ex, do_brk(0, text_data); retval = -ENOEXEC; - if (!interpreter->f_op->read) + if (!interpreter->f_op || !interpreter->f_op->read) goto out; retval = interpreter->f_op->read(interpreter, addr, text_data, &offset); if (retval < 0) @@ -789,7 +789,7 @@ static int load_elf_library(struct file *file) /* First of all, some simple consistency checks */ if (elf_ex.e_type != ET_EXEC || elf_ex.e_phnum > 2 || - !elf_check_arch(&elf_ex) || !file->f_op->mmap) + !elf_check_arch(&elf_ex) || !file->f_op || !file->f_op->mmap) goto out; /* Now read in all of the header information */ |