Commit f597a4ce authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Krzysztof Kozlowski
Browse files

w1: ds2413: Constify 'struct bin_attribute' 



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: default avatarThomas 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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
parent 49277283

drivers/w1/slaves/w1_ds2413.c

+7 −7
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
#define W1_F3A_INVALID_PIO_STATE           0xFF



static ssize_t state_read(struct file *filp, struct kobject *kobj,

			  struct bin_attribute *bin_attr, char *buf, loff_t off,

			  size_t count)

			  const struct bin_attribute *bin_attr, char *buf,

			  loff_t off, size_t count)

{

	struct w1_slave *sl = kobj_to_w1_slave(kobj);

	unsigned int retries = W1_F3A_RETRIES;
@@ -78,10 +78,10 @@ static ssize_t state_read(struct file *filp, struct kobject *kobj, 
	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,

			    struct bin_attribute *bin_attr, char *buf,

			    const struct bin_attribute *bin_attr, char *buf,

			    loff_t off, size_t count)

{

	struct w1_slave *sl = kobj_to_w1_slave(kobj);
@@ -128,16 +128,16 @@ static ssize_t output_write(struct file *filp, struct kobject *kobj, 
	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_output,

	NULL,

};



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[] = {