diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-09-22 16:27:52 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-10-24 23:34:54 -0400 |
commit | 72c2d53192004845cbc19cd8a30b3212a9288140 (patch) | |
tree | 31fcd924438f03d5aa09d13ffd813fb153da37c3 /fs/binfmt_elf.c | |
parent | 22bd002ee76aa7d7a3393f39d977f6c106153c60 (diff) |
file->f_op is never NULL...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
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 4c94a79991bb..501c8a4d6eb1 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c | |||
@@ -406,7 +406,7 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex, | |||
406 | goto out; | 406 | goto out; |
407 | if (!elf_check_arch(interp_elf_ex)) | 407 | if (!elf_check_arch(interp_elf_ex)) |
408 | goto out; | 408 | goto out; |
409 | if (!interpreter->f_op || !interpreter->f_op->mmap) | 409 | if (!interpreter->f_op->mmap) |
410 | goto out; | 410 | goto out; |
411 | 411 | ||
412 | /* | 412 | /* |
@@ -607,7 +607,7 @@ static int load_elf_binary(struct linux_binprm *bprm) | |||
607 | goto out; | 607 | goto out; |
608 | if (!elf_check_arch(&loc->elf_ex)) | 608 | if (!elf_check_arch(&loc->elf_ex)) |
609 | goto out; | 609 | goto out; |
610 | if (!bprm->file->f_op || !bprm->file->f_op->mmap) | 610 | if (!bprm->file->f_op->mmap) |
611 | goto out; | 611 | goto out; |
612 | 612 | ||
613 | /* Now read in all of the header information */ | 613 | /* Now read in all of the header information */ |
@@ -1028,7 +1028,7 @@ static int load_elf_library(struct file *file) | |||
1028 | 1028 | ||
1029 | /* First of all, some simple consistency checks */ | 1029 | /* First of all, some simple consistency checks */ |
1030 | if (elf_ex.e_type != ET_EXEC || elf_ex.e_phnum > 2 || | 1030 | if (elf_ex.e_type != ET_EXEC || elf_ex.e_phnum > 2 || |
1031 | !elf_check_arch(&elf_ex) || !file->f_op || !file->f_op->mmap) | 1031 | !elf_check_arch(&elf_ex) || !file->f_op->mmap) |
1032 | goto out; | 1032 | goto out; |
1033 | 1033 | ||
1034 | /* Now read in all of the header information */ | 1034 | /* Now read in all of the header information */ |