diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2008-07-31 13:41:58 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-10-23 05:13:25 -0400 |
| commit | f696a3659fc4b3a3bf4bc83d9dbec5e5a2ffd929 (patch) | |
| tree | 738adf557608f26e881a710839de12b7527549b6 /fs/coda | |
| parent | 5cec56deb6d41b5b570306b17cd0b1590ebd0897 (diff) | |
| download | linux-3.10-f696a3659fc4b3a3bf4bc83d9dbec5e5a2ffd929.tar.gz linux-3.10-f696a3659fc4b3a3bf4bc83d9dbec5e5a2ffd929.tar.bz2 linux-3.10-f696a3659fc4b3a3bf4bc83d9dbec5e5a2ffd929.zip | |
[PATCH] move executable checking into ->permission()
For execute permission on a regular files we need to check if file has
any execute bits at all, regardless of capabilites.
This check is normally performed by generic_permission() but was also
added to the case when the filesystem defines its own ->permission()
method. In the latter case the filesystem should be responsible for
performing this check.
Move the check from inode_permission() inside filesystems which are
not calling generic_permission().
Create a helper function execute_ok() that returns true if the inode
is a directory or if any execute bits are present in i_mode.
Also fix up the following code:
- coda control file is never executable
- sysctl files are never executable
- hfs_permission seems broken on MAY_EXEC, remove
- hfsplus_permission is eqivalent to generic_permission(), remove
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Diffstat (limited to 'fs/coda')
| -rw-r--r-- | fs/coda/dir.c | 3 | ||||
| -rw-r--r-- | fs/coda/pioctl.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/fs/coda/dir.c b/fs/coda/dir.c index c5916228243..75b1fa90b2c 100644 --- a/fs/coda/dir.c +++ b/fs/coda/dir.c @@ -146,6 +146,9 @@ int coda_permission(struct inode *inode, int mask) if (!mask) return 0; + if ((mask & MAY_EXEC) && !execute_ok(inode)) + return -EACCES; + lock_kernel(); if (coda_cache_check(inode, mask)) diff --git a/fs/coda/pioctl.c b/fs/coda/pioctl.c index c51365422aa..773f2ce9aa0 100644 --- a/fs/coda/pioctl.c +++ b/fs/coda/pioctl.c @@ -43,7 +43,7 @@ const struct file_operations coda_ioctl_operations = { /* the coda pioctl inode ops */ static int coda_ioctl_permission(struct inode *inode, int mask) { - return 0; + return (mask & MAY_EXEC) ? -EACCES : 0; } static int coda_pioctl(struct inode * inode, struct file * filp, |