]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
w1: ds2433: Constify 'struct bin_attribute'
authorThomas Weißschuh <linux@weissschuh.net>
Wed, 11 Dec 2024 17:50:22 +0000 (18:50 +0100)
committerKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Sat, 14 Dec 2024 10:06:27 +0000 (11:06 +0100)
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-7-c4befd2aa7cc@weissschuh.net
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
drivers/w1/slaves/w1_ds2433.c

index 250b7f7ec429e92a6146452a20d591644af4e083..22331d840ec18ae5fa6dfe7bd3437d8bb47057ad 100644 (file)
@@ -110,7 +110,7 @@ static int w1_f23_refresh_block(struct w1_slave *sl, struct w1_f23_data *data,
 #endif /* CONFIG_W1_SLAVE_DS2433_CRC */
 
 static ssize_t eeprom_read(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);
@@ -224,7 +224,7 @@ static int w1_f23_write(struct w1_slave *sl, int addr, int len, const u8 *data)
 }
 
 static ssize_t eeprom_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);
@@ -274,27 +274,27 @@ out_up:
        return count;
 }
 
-static struct bin_attribute bin_attr_f23_eeprom = {
+static const struct bin_attribute bin_attr_f23_eeprom = {
        .attr = { .name = "eeprom", .mode = 0644 },
-       .read = eeprom_read,
-       .write = eeprom_write,
+       .read_new = eeprom_read,
+       .write_new = eeprom_write,
        .size = W1_EEPROM_DS2433_SIZE,
 };
 
-static struct bin_attribute bin_attr_f43_eeprom = {
+static const struct bin_attribute bin_attr_f43_eeprom = {
        .attr = { .name = "eeprom", .mode = 0644 },
-       .read = eeprom_read,
-       .write = eeprom_write,
+       .read_new = eeprom_read,
+       .write_new = eeprom_write,
        .size = W1_EEPROM_DS28EC20_SIZE,
 };
 
-static struct bin_attribute *w1_f23_bin_attributes[] = {
+static const struct bin_attribute *const w1_f23_bin_attributes[] = {
        &bin_attr_f23_eeprom,
        NULL,
 };
 
 static const struct attribute_group w1_f23_group = {
-       .bin_attrs = w1_f23_bin_attributes,
+       .bin_attrs_new = w1_f23_bin_attributes,
 };
 
 static const struct attribute_group *w1_f23_groups[] = {
@@ -302,13 +302,13 @@ static const struct attribute_group *w1_f23_groups[] = {
        NULL,
 };
 
-static struct bin_attribute *w1_f43_bin_attributes[] = {
+static const struct bin_attribute *const w1_f43_bin_attributes[] = {
        &bin_attr_f43_eeprom,
        NULL,
 };
 
 static const struct attribute_group w1_f43_group = {
-       .bin_attrs = w1_f43_bin_attributes,
+       .bin_attrs_new = w1_f43_bin_attributes,
 };
 
 static const struct attribute_group *w1_f43_groups[] = {