From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 23 Aug 2006 00:06:04 +0000 (-0400)
Subject: VFS: Remove redundant open-coded mode bit checks in open_exec().
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a969fd5a4e162c4485ae8f3e49d674656a18fa36;p=deliverable%2Flinux.git

VFS: Remove redundant open-coded mode bit checks in open_exec().

The check in open_exec() for inode->i_mode & 0111 has been made
redundant by the fix to permission().

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
(cherry picked from 1d3741c5d991686699f100b65b9956f7ee7ae0ae commit)
---

diff --git a/fs/exec.c b/fs/exec.c
index a6f64a98ac50..f7aabfeca033 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -486,8 +486,6 @@ struct file *open_exec(const char *name)
 		if (!(nd.mnt->mnt_flags & MNT_NOEXEC) &&
 		    S_ISREG(inode->i_mode)) {
 			int err = vfs_permission(&nd, MAY_EXEC);
-			if (!err && !(inode->i_mode & 0111))
-				err = -EACCES;
 			file = ERR_PTR(err);
 			if (!err) {
 				file = nameidata_to_filp(&nd, O_RDONLY);