f696a3659f
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>
94 lines
2.4 KiB
C
94 lines
2.4 KiB
C
/*
|
|
* Pioctl operations for Coda.
|
|
* Original version: (C) 1996 Peter Braam
|
|
* Rewritten for Linux 2.1: (C) 1997 Carnegie Mellon University
|
|
*
|
|
* Carnegie Mellon encourages users of this code to contribute improvements
|
|
* to the Coda project. Contact Peter Braam <coda@cs.cmu.edu>.
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/time.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/stat.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/string.h>
|
|
#include <linux/namei.h>
|
|
#include <linux/module.h>
|
|
#include <asm/uaccess.h>
|
|
|
|
#include <linux/coda.h>
|
|
#include <linux/coda_linux.h>
|
|
#include <linux/coda_fs_i.h>
|
|
#include <linux/coda_psdev.h>
|
|
|
|
/* pioctl ops */
|
|
static int coda_ioctl_permission(struct inode *inode, int mask);
|
|
static int coda_pioctl(struct inode * inode, struct file * filp,
|
|
unsigned int cmd, unsigned long user_data);
|
|
|
|
/* exported from this file */
|
|
const struct inode_operations coda_ioctl_inode_operations =
|
|
{
|
|
.permission = coda_ioctl_permission,
|
|
.setattr = coda_setattr,
|
|
};
|
|
|
|
const struct file_operations coda_ioctl_operations = {
|
|
.owner = THIS_MODULE,
|
|
.ioctl = coda_pioctl,
|
|
};
|
|
|
|
/* the coda pioctl inode ops */
|
|
static int coda_ioctl_permission(struct inode *inode, int mask)
|
|
{
|
|
return (mask & MAY_EXEC) ? -EACCES : 0;
|
|
}
|
|
|
|
static int coda_pioctl(struct inode * inode, struct file * filp,
|
|
unsigned int cmd, unsigned long user_data)
|
|
{
|
|
struct path path;
|
|
int error;
|
|
struct PioctlData data;
|
|
struct inode *target_inode = NULL;
|
|
struct coda_inode_info *cnp;
|
|
|
|
/* get the Pioctl data arguments from user space */
|
|
if (copy_from_user(&data, (void __user *)user_data, sizeof(data))) {
|
|
return -EINVAL;
|
|
}
|
|
|
|
/*
|
|
* Look up the pathname. Note that the pathname is in
|
|
* user memory, and namei takes care of this
|
|
*/
|
|
if (data.follow) {
|
|
error = user_path(data.path, &path);
|
|
} else {
|
|
error = user_lpath(data.path, &path);
|
|
}
|
|
|
|
if ( error ) {
|
|
return error;
|
|
} else {
|
|
target_inode = path.dentry->d_inode;
|
|
}
|
|
|
|
/* return if it is not a Coda inode */
|
|
if ( target_inode->i_sb != inode->i_sb ) {
|
|
path_put(&path);
|
|
return -EINVAL;
|
|
}
|
|
|
|
/* now proceed to make the upcall */
|
|
cnp = ITOC(target_inode);
|
|
|
|
error = venus_pioctl(inode->i_sb, &(cnp->c_fid), cmd, &data);
|
|
|
|
path_put(&path);
|
|
return error;
|
|
}
|
|
|