aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-08-22 20:06:03 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-08-24 15:55:06 -0400
commit9167b0b9a0ab7907191523f5a0528e3b9c288e21 (patch)
tree63345d9bacaf1b30e977a5cd24322d2426f6109f
parenta343bb7750e6a098909c34f5c5dfddbc4fa40053 (diff)
downloadlinux-stericsson-9167b0b9a0ab7907191523f5a0528e3b9c288e21.tar.gz
VFS: Remove redundant open-coded mode bit check in prepare_binfmt().
The check in prepare_binfmt() for inode->i_mode & 0111 is redundant, since open_exec() will already have done that. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> (cherry picked from 822dec482ced07af32c378cd936d77345786572b commit)
-rw-r--r--fs/exec.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 8344ba73a2a6..a6f64a98ac50 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -922,12 +922,6 @@ int prepare_binprm(struct linux_binprm *bprm)
int retval;
mode = inode->i_mode;
- /*
- * Check execute perms again - if the caller has CAP_DAC_OVERRIDE,
- * generic_permission lets a non-executable through
- */
- if (!(mode & 0111)) /* with at least _one_ execute bit set */
- return -EACCES;
if (bprm->file->f_op == NULL)
return -EACCES;