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

w1: 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-1-c4befd2aa7cc@weissschuh.net


Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
parent 5f69c091

drivers/w1/w1.c

+6 −6
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ ATTRIBUTE_GROUPS(w1_slave); 
/* Default family */



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

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

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

			size_t count)

{

	struct w1_slave *sl = kobj_to_w1_slave(kobj);
@@ -130,8 +130,8 @@ static ssize_t rw_write(struct file *filp, struct kobject *kobj, 
}



static ssize_t rw_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);
@@ -141,15 +141,15 @@ static ssize_t rw_read(struct file *filp, struct kobject *kobj, 
	return count;

}



static BIN_ATTR_RW(rw, PAGE_SIZE);

static const BIN_ATTR_RW(rw, PAGE_SIZE);



static struct bin_attribute *w1_slave_bin_attrs[] = {

static const struct bin_attribute *const w1_slave_bin_attrs[] = {

	&bin_attr_rw,

	NULL,

};



static const struct attribute_group w1_slave_default_group = {

	.bin_attrs = w1_slave_bin_attrs,

	.bin_attrs_new = w1_slave_bin_attrs,

};



static const struct attribute_group *w1_slave_default_groups[] = {