Commit 0de8c962 authored by Patrick Mochel's avatar Patrick Mochel

sysfs: do permission checking on open.

sysfs has always had a bug that would allow a read-only file to be opened 
for writing. It has also returned 0 on write when there was no store method
defined for the file. 

This addresses both via sysfs_open_file(). It checks the flags the file was
opened with and compares them with the mode of the inode. If the mode does
not support the flags passed, -EPERM is returned.

If the sysfs_ops for the object does not have the correct method for the 
flags, -EACCESS is returned. 

Since all checks happen on open(), the corresponding checks in the read()
and write() methods have been removed. 
parent bb4be78a
...@@ -175,17 +175,11 @@ static ssize_t ...@@ -175,17 +175,11 @@ static ssize_t
sysfs_read_file(struct file *file, char *buf, size_t count, loff_t *ppos) sysfs_read_file(struct file *file, char *buf, size_t count, loff_t *ppos)
{ {
struct attribute * attr = file->f_dentry->d_fsdata; struct attribute * attr = file->f_dentry->d_fsdata;
struct sysfs_ops * ops = NULL; struct sysfs_ops * ops = file->private_data;
struct kobject * kobj; struct kobject * kobj = file->f_dentry->d_parent->d_fsdata;
unsigned char *page; unsigned char *page;
ssize_t retval = 0; ssize_t retval = 0;
kobj = file->f_dentry->d_parent->d_fsdata;
if (kobj && kobj->subsys)
ops = kobj->subsys->sysfs_ops;
if (!ops || !ops->show)
return 0;
if (count > PAGE_SIZE) if (count > PAGE_SIZE)
count = PAGE_SIZE; count = PAGE_SIZE;
...@@ -236,17 +230,11 @@ static ssize_t ...@@ -236,17 +230,11 @@ static ssize_t
sysfs_write_file(struct file *file, const char *buf, size_t count, loff_t *ppos) sysfs_write_file(struct file *file, const char *buf, size_t count, loff_t *ppos)
{ {
struct attribute * attr = file->f_dentry->d_fsdata; struct attribute * attr = file->f_dentry->d_fsdata;
struct sysfs_ops * ops = NULL; struct sysfs_ops * ops = file->private_data;
struct kobject * kobj; struct kobject * kobj = file->f_dentry->d_parent->d_fsdata;
ssize_t retval = 0; ssize_t retval = 0;
char * page; char * page;
kobj = file->f_dentry->d_parent->d_fsdata;
if (kobj && kobj->subsys)
ops = kobj->subsys->sysfs_ops;
if (!ops || !ops->store)
return 0;
page = (char *)__get_free_page(GFP_KERNEL); page = (char *)__get_free_page(GFP_KERNEL);
if (!page) if (!page)
return -ENOMEM; return -ENOMEM;
...@@ -277,21 +265,72 @@ sysfs_write_file(struct file *file, const char *buf, size_t count, loff_t *ppos) ...@@ -277,21 +265,72 @@ sysfs_write_file(struct file *file, const char *buf, size_t count, loff_t *ppos)
return retval; return retval;
} }
static int sysfs_open_file(struct inode * inode, struct file * filp) static int check_perm(struct inode * inode, struct file * file)
{ {
struct kobject * kobj; struct kobject * kobj = kobject_get(file->f_dentry->d_parent->d_fsdata);
struct attribute * attr = file->f_dentry->d_fsdata;
struct sysfs_ops * ops = NULL;
int error = 0; int error = 0;
kobj = filp->f_dentry->d_parent->d_fsdata; if (!kobj || !attr)
if ((kobj = kobject_get(kobj))) { goto Einval;
struct attribute * attr = filp->f_dentry->d_fsdata;
if (!attr) if (kobj->subsys)
error = -EINVAL; ops = kobj->subsys->sysfs_ops;
} else
/* No sysfs operations, either from having no subsystem,
* or the subsystem have no operations.
*/
if (!ops)
goto Eaccess;
/* File needs write support.
* The inode's perms must say it's ok,
* and we must have a store method.
*/
if (file->f_mode & FMODE_WRITE) {
if (!(inode->i_mode & S_IWUGO))
goto Eperm;
if (!ops->store)
goto Eaccess;
}
/* File needs read support.
* The inode's perms must say it's ok, and we there
* must be a show method for it.
*/
if (file->f_mode & FMODE_READ) {
if (!(inode->i_mode & S_IRUGO))
goto Eperm;
if (!ops->show)
goto Eaccess;
}
/* No error? Great, store the ops in file->private_data
* for easy access in the read/write functions.
*/
file->private_data = ops;
goto Done;
Einval:
error = -EINVAL; error = -EINVAL;
goto Done;
Eaccess:
error = -EACCES;
goto Done;
Eperm:
error = -EPERM;
Done:
return error; return error;
} }
static int sysfs_open_file(struct inode * inode, struct file * filp)
{
return check_perm(inode,filp);
}
static int sysfs_release(struct inode * inode, struct file * filp) static int sysfs_release(struct inode * inode, struct file * filp)
{ {
struct kobject * kobj = filp->f_dentry->d_parent->d_fsdata; struct kobject * kobj = filp->f_dentry->d_parent->d_fsdata;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment