commit 72c2d53192004845cbc19cd8a30b3212a9288140
author Al Viro <viro@zeniv.linux.org.uk> Sun Sep 22 16:27:52 2013 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Thu Oct 24 23:34:54 2013 -0400
tree 31fcd924438f03d5aa09d13ffd813fb153da37c3
parent 22bd002ee76aa7d7a3393f39d977f6c106153c60

file->f_op is never NULL...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/binfmt_elf.c

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 4c94a79..501c8a4 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -406,7 +406,7 @@
 		goto out;
 	if (!elf_check_arch(interp_elf_ex))
 		goto out;
-	if (!interpreter->f_op || !interpreter->f_op->mmap)
+	if (!interpreter->f_op->mmap)
 		goto out;
 
 	/*
@@ -607,7 +607,7 @@
 		goto out;
 	if (!elf_check_arch(&loc->elf_ex))
 		goto out;
-	if (!bprm->file->f_op || !bprm->file->f_op->mmap)
+	if (!bprm->file->f_op->mmap)
 		goto out;
 
 	/* Now read in all of the header information */
@@ -1028,7 +1028,7 @@
 
 	/* 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 || !file->f_op->mmap)
+	    !elf_check_arch(&elf_ex) || !file->f_op->mmap)
 		goto out;
 
 	/* Now read in all of the header information */