]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
cxl: Constify 'struct bin_attribute'
authorThomas Weißschuh <linux@weissschuh.net>
Sat, 21 Dec 2024 14:48:08 +0000 (15:48 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Dec 2024 08:36:01 +0000 (09:36 +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>
Acked-by: Andrew Donnellan <ajd@linux.ibm.com>
Link: https://lore.kernel.org/r/20241221-sysfs-const-bin_attr-misc-drivers-v2-2-ba5e79fe8771@weissschuh.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/cxl/sysfs.c

index 409bd1c39663159a0d11c3ccba2aa5a8451baa34..b1fc6446bd4b7caa2f5c6e23e0aba5934caffd46 100644 (file)
@@ -444,7 +444,7 @@ static ssize_t api_version_compatible_show(struct device *device,
 }
 
 static ssize_t afu_eb_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 cxl_afu *afu = to_cxl_afu(kobj_to_dev(kobj));
@@ -538,7 +538,7 @@ static ssize_t class_show(struct kobject *kobj,
 }
 
 static ssize_t afu_read_config(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 afu_config_record *cr = to_cr(kobj);
@@ -620,7 +620,7 @@ static struct afu_config_record *cxl_sysfs_afu_new_cr(struct cxl_afu *afu, int c
        cr->config_attr.attr.name = "config";
        cr->config_attr.attr.mode = S_IRUSR;
        cr->config_attr.size = afu->crs_len;
-       cr->config_attr.read = afu_read_config;
+       cr->config_attr.read_new = afu_read_config;
 
        rc = kobject_init_and_add(&cr->kobj, &afu_config_record_type,
                                  &afu->dev.kobj, "cr%i", cr->cr);
@@ -693,7 +693,7 @@ int cxl_sysfs_afu_add(struct cxl_afu *afu)
                afu->attr_eb.attr.name = "afu_err_buff";
                afu->attr_eb.attr.mode = S_IRUGO;
                afu->attr_eb.size = afu->eb_len;
-               afu->attr_eb.read = afu_eb_read;
+               afu->attr_eb.read_new = afu_eb_read;
 
                rc = device_create_bin_file(&afu->dev, &afu->attr_eb);
                if (rc) {