diff options
author | 2008-07-22 00:02:33 -0400 | |
---|---|---|
committer | 2008-07-26 20:53:30 -0400 | |
commit | 30524472c2f728c20d6bf35191042a5d455c0a64 (patch) | |
tree | e9985d3883b45c4a9f5ef8185fa79c7b568bb4bd /fs/exec.c | |
parent | Re: [PATCH 3/6] vfs: open_exec cleanup (diff) | |
download | linux-30524472c2f728c20d6bf35191042a5d455c0a64.tar.gz linux-30524472c2f728c20d6bf35191042a5d455c0a64.tar.bz2 linux-30524472c2f728c20d6bf35191042a5d455c0a64.zip |
[PATCH] take noexec checks to very few callers that care
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/exec.c')
-rw-r--r-- | fs/exec.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/exec.c b/fs/exec.c index 346e3f69c6e0..eca58c29eded 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -118,6 +118,10 @@ asmlinkage long sys_uselib(const char __user * library) if (!S_ISREG(nd.path.dentry->d_inode->i_mode)) goto exit; + error = -EACCES; + if (nd.path.mnt->mnt_flags & MNT_NOEXEC) + goto exit; + error = vfs_permission(&nd, MAY_READ | MAY_EXEC | MAY_OPEN); if (error) goto exit; @@ -668,6 +672,9 @@ struct file *open_exec(const char *name) if (!S_ISREG(nd.path.dentry->d_inode->i_mode)) goto out_path_put; + if (nd.path.mnt->mnt_flags & MNT_NOEXEC) + goto out_path_put; + err = vfs_permission(&nd, MAY_EXEC | MAY_OPEN); if (err) goto out_path_put; |