diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2008-07-22 06:02:33 +0200 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-07-27 02:53:30 +0200 |
commit | 30524472c2f728c20d6bf35191042a5d455c0a64 (patch) | |
tree | e9985d3883b45c4a9f5ef8185fa79c7b568bb4bd /fs/open.c | |
parent | Re: [PATCH 3/6] vfs: open_exec cleanup (diff) | |
download | linux-30524472c2f728c20d6bf35191042a5d455c0a64.tar.xz 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/open.c')
-rw-r--r-- | fs/open.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/fs/open.c b/fs/open.c index 3b3c43674be3..d5e421ad0cf6 100644 --- a/fs/open.c +++ b/fs/open.c @@ -461,6 +461,16 @@ asmlinkage long sys_faccessat(int dfd, const char __user *filename, int mode) if (res) goto out; + if ((mode & MAY_EXEC) && S_ISREG(nd.path.dentry->d_inode->i_mode)) { + /* + * MAY_EXEC on regular files is denied if the fs is mounted + * with the "noexec" flag. + */ + res = -EACCES; + if (nd.path.mnt->mnt_flags & MNT_NOEXEC) + goto out_path_release; + } + res = vfs_permission(&nd, mode | MAY_ACCESS); /* SuS v2 requires we report a read only fs too */ if(res || !(mode & S_IWOTH) || |