public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

w1: ds2413: Constify 'struct bin_attribute'

Browse source 
The sysfs core now allows instances of 'struct bin_attribute' to be
moved into read-only memory. Make use of that to protect them against
accidental or malicious modifications.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://lore.kernel.org/r/20241211-sysfs-const-bin_attr-w1-v1-4-c4befd2aa7cc@weissschuh.net
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
This commit is contained in:
Thomas Weißschuh 2024-12-11 18:50:19 +01:00 • committed by Krzysztof Kozlowski
parent 492772838d
commit f597a4ce8c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/w1/slaves/w1_ds2413.c
View file

@ -25,8 +25,8 @@
#define W1_F3A_INVALID_PIO_STATE 0xFF #define W1_F3A_INVALID_PIO_STATE 0xFF
static ssize_t state_read(struct file *filp, struct kobject *kobj, static ssize_t state_read(struct file *filp, struct kobject *kobj,
struct bin_attribute *bin_attr, char *buf, loff_t off, const struct bin_attribute *bin_attr, char *buf,
size_t count) loff_t off, size_t count)
{ {
struct w1_slave *sl = kobj_to_w1_slave(kobj); struct w1_slave *sl = kobj_to_w1_slave(kobj);
unsigned int retries = W1_F3A_RETRIES; unsigned int retries = W1_F3A_RETRIES;
@ -78,10 +78,10 @@ out:
return bytes_read; return bytes_read;
} }
static BIN_ATTR_RO(state, 1); static const BIN_ATTR_RO(state, 1);
static ssize_t output_write(struct file *filp, struct kobject *kobj, static ssize_t output_write(struct file *filp, struct kobject *kobj,
struct bin_attribute *bin_attr, char *buf, const struct bin_attribute *bin_attr, char *buf,
loff_t off, size_t count) loff_t off, size_t count)
{ {
struct w1_slave *sl = kobj_to_w1_slave(kobj); struct w1_slave *sl = kobj_to_w1_slave(kobj);
@ -128,16 +128,16 @@ out:
return bytes_written; return bytes_written;
} }
static BIN_ATTR(output, 0664, NULL, output_write, 1); static const BIN_ATTR(output, 0664, NULL, output_write, 1);
static struct bin_attribute *w1_f3a_bin_attrs[] = { static const struct bin_attribute *const w1_f3a_bin_attrs[] = {
&bin_attr_state, &bin_attr_state,
&bin_attr_output, &bin_attr_output,
NULL, NULL,
}; };
static const struct attribute_group w1_f3a_group = { static const struct attribute_group w1_f3a_group = {
.bin_attrs = w1_f3a_bin_attrs, .bin_attrs_new = w1_f3a_bin_attrs,
}; };
static const struct attribute_group *w1_f3a_groups[] = { static const struct attribute_group *w1_f3a_groups[] = {