diff options
| author | Chris Wright <chrisw@sous-sol.org> | 2010-05-12 21:28:57 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-21 12:37:31 -0400 |
| commit | 2c3c8bea608866d8bd9dcf92657d57fdcac011c5 (patch) | |
| tree | f509b958d0a65c46c831dbdd447a81e706dd995a /drivers/w1/slaves | |
| parent | 68d75ed4b84a0806ecd4bc14da4759713b23a532 (diff) | |
sysfs: add struct file* to bin_attr callbacks
This allows bin_attr->read,write,mmap callbacks to check file specific data
(such as inode owner) as part of any privilege validation.
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/w1/slaves')
| -rw-r--r-- | drivers/w1/slaves/w1_ds2431.c | 4 | ||||
| -rw-r--r-- | drivers/w1/slaves/w1_ds2433.c | 4 | ||||
| -rw-r--r-- | drivers/w1/slaves/w1_ds2760.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/w1/slaves/w1_ds2431.c b/drivers/w1/slaves/w1_ds2431.c index 2c6c0cf6a20f..84e2410aec1d 100644 --- a/drivers/w1/slaves/w1_ds2431.c +++ b/drivers/w1/slaves/w1_ds2431.c | |||
| @@ -96,7 +96,7 @@ static int w1_f2d_readblock(struct w1_slave *sl, int off, int count, char *buf) | |||
| 96 | return -1; | 96 | return -1; |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | static ssize_t w1_f2d_read_bin(struct kobject *kobj, | 99 | static ssize_t w1_f2d_read_bin(struct file *filp, struct kobject *kobj, |
| 100 | struct bin_attribute *bin_attr, | 100 | struct bin_attribute *bin_attr, |
| 101 | char *buf, loff_t off, size_t count) | 101 | char *buf, loff_t off, size_t count) |
| 102 | { | 102 | { |
| @@ -202,7 +202,7 @@ retry: | |||
| 202 | return 0; | 202 | return 0; |
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | static ssize_t w1_f2d_write_bin(struct kobject *kobj, | 205 | static ssize_t w1_f2d_write_bin(struct file *filp, struct kobject *kobj, |
| 206 | struct bin_attribute *bin_attr, | 206 | struct bin_attribute *bin_attr, |
| 207 | char *buf, loff_t off, size_t count) | 207 | char *buf, loff_t off, size_t count) |
| 208 | { | 208 | { |
diff --git a/drivers/w1/slaves/w1_ds2433.c b/drivers/w1/slaves/w1_ds2433.c index d2bf32118a98..0f7b8f9c509a 100644 --- a/drivers/w1/slaves/w1_ds2433.c +++ b/drivers/w1/slaves/w1_ds2433.c | |||
| @@ -92,7 +92,7 @@ static int w1_f23_refresh_block(struct w1_slave *sl, struct w1_f23_data *data, | |||
| 92 | } | 92 | } |
| 93 | #endif /* CONFIG_W1_SLAVE_DS2433_CRC */ | 93 | #endif /* CONFIG_W1_SLAVE_DS2433_CRC */ |
| 94 | 94 | ||
| 95 | static ssize_t w1_f23_read_bin(struct kobject *kobj, | 95 | static ssize_t w1_f23_read_bin(struct file *filp, struct kobject *kobj, |
| 96 | struct bin_attribute *bin_attr, | 96 | struct bin_attribute *bin_attr, |
| 97 | char *buf, loff_t off, size_t count) | 97 | char *buf, loff_t off, size_t count) |
| 98 | { | 98 | { |
| @@ -206,7 +206,7 @@ static int w1_f23_write(struct w1_slave *sl, int addr, int len, const u8 *data) | |||
| 206 | return 0; | 206 | return 0; |
| 207 | } | 207 | } |
| 208 | 208 | ||
| 209 | static ssize_t w1_f23_write_bin(struct kobject *kobj, | 209 | static ssize_t w1_f23_write_bin(struct file *filp, struct kobject *kobj, |
| 210 | struct bin_attribute *bin_attr, | 210 | struct bin_attribute *bin_attr, |
| 211 | char *buf, loff_t off, size_t count) | 211 | char *buf, loff_t off, size_t count) |
| 212 | { | 212 | { |
diff --git a/drivers/w1/slaves/w1_ds2760.c b/drivers/w1/slaves/w1_ds2760.c index 6e153343e117..483d45180911 100644 --- a/drivers/w1/slaves/w1_ds2760.c +++ b/drivers/w1/slaves/w1_ds2760.c | |||
| @@ -97,7 +97,7 @@ int w1_ds2760_recall_eeprom(struct device *dev, int addr) | |||
| 97 | return w1_ds2760_eeprom_cmd(dev, addr, W1_DS2760_RECALL_DATA); | 97 | return w1_ds2760_eeprom_cmd(dev, addr, W1_DS2760_RECALL_DATA); |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | static ssize_t w1_ds2760_read_bin(struct kobject *kobj, | 100 | static ssize_t w1_ds2760_read_bin(struct file *filp, struct kobject *kobj, |
| 101 | struct bin_attribute *bin_attr, | 101 | struct bin_attribute *bin_attr, |
| 102 | char *buf, loff_t off, size_t count) | 102 | char *buf, loff_t off, size_t count) |
| 103 | { | 103 | { |