diff options
author | Miklos Szeredi <mszeredi@suse.cz> | 2008-06-16 07:46:47 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-22 00:54:57 -0400 |
commit | 93265d13ea5c3ec5f61a8009407fbe046ce6b7c0 (patch) | |
tree | 1db94fa6cc1ee9b0eae1332a340ac98efa4d8f28 | |
parent | 838ea8e8dbfc8d907c7a55bbad507a44c1b81d57 (diff) |
sysfs: don't call notify_change
sysfs_chmod_file() calls notify_change() to change the permission bits
on a sysfs file. Replace with explicit call to sysfs_setattr() and
fsnotify_change().
This is equivalent, except that security_inode_setattr() is not
called. This function is called by drivers, so the security checks do
not make any sense.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | fs/sysfs/file.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index e7735f643cd1..3f07893ff896 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/kobject.h> | 14 | #include <linux/kobject.h> |
15 | #include <linux/kallsyms.h> | 15 | #include <linux/kallsyms.h> |
16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
17 | #include <linux/fsnotify.h> | ||
17 | #include <linux/namei.h> | 18 | #include <linux/namei.h> |
18 | #include <linux/poll.h> | 19 | #include <linux/poll.h> |
19 | #include <linux/list.h> | 20 | #include <linux/list.h> |
@@ -585,9 +586,11 @@ int sysfs_chmod_file(struct kobject *kobj, struct attribute *attr, mode_t mode) | |||
585 | 586 | ||
586 | newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO); | 587 | newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO); |
587 | newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; | 588 | newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; |
588 | rc = notify_change(victim, &newattrs); | 589 | newattrs.ia_ctime = current_fs_time(inode->i_sb); |
590 | rc = sysfs_setattr(victim, &newattrs); | ||
589 | 591 | ||
590 | if (rc == 0) { | 592 | if (rc == 0) { |
593 | fsnotify_change(victim, newattrs.ia_valid); | ||
591 | mutex_lock(&sysfs_mutex); | 594 | mutex_lock(&sysfs_mutex); |
592 | victim_sd->s_mode = newattrs.ia_mode; | 595 | victim_sd->s_mode = newattrs.ia_mode; |
593 | mutex_unlock(&sysfs_mutex); | 596 | mutex_unlock(&sysfs_mutex); |