diff options
author | Miklos Szeredi <miklos@szeredi.hu> | 2008-07-31 07:41:58 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-10-23 05:13:25 -0400 |
commit | f696a3659fc4b3a3bf4bc83d9dbec5e5a2ffd929 (patch) | |
tree | 738adf557608f26e881a710839de12b7527549b6 /include/linux/fs.h | |
parent | 5cec56deb6d41b5b570306b17cd0b1590ebd0897 (diff) |
[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 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 5f70aa62cf0f..025a4a251b64 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -1851,6 +1851,11 @@ extern int inode_permission(struct inode *, int); | |||
1851 | extern int generic_permission(struct inode *, int, | 1851 | extern int generic_permission(struct inode *, int, |
1852 | int (*check_acl)(struct inode *, int)); | 1852 | int (*check_acl)(struct inode *, int)); |
1853 | 1853 | ||
1854 | static inline bool execute_ok(struct inode *inode) | ||
1855 | { | ||
1856 | return (inode->i_mode & S_IXUGO) || S_ISDIR(inode->i_mode); | ||
1857 | } | ||
1858 | |||
1854 | extern int get_write_access(struct inode *); | 1859 | extern int get_write_access(struct inode *); |
1855 | extern int deny_write_access(struct file *); | 1860 | extern int deny_write_access(struct file *); |
1856 | static inline void put_write_access(struct inode * inode) | 1861 | static inline void put_write_access(struct inode * inode) |