diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-24 22:29:46 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-24 22:29:46 -0700 |
| commit | 62250b3bb596ffbae17c4b3d865fecd6329ce8b3 (patch) | |
| tree | 8f18da918c319a1f0be6c4011b60091bb29dc007 /fs/exec.c | |
| parent | 428a7e3e46a465a6cfe7ccbe15d7ea03a043a95a (diff) | |
| parent | a969fd5a4e162c4485ae8f3e49d674656a18fa36 (diff) | |
| download | linux-62250b3bb596ffbae17c4b3d865fecd6329ce8b3.tar.bz2 | |
Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/exec.c b/fs/exec.c index 8344ba73a2a6..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); @@ -922,12 +920,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; |