Skip to content

Commit

Permalink
zorro: Constify 'struct bin_attribute'
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Geert Uytterhoeven <[email protected]>
Link: https://lore.kernel.org/20241216-sysfs-const-bin_attr-zorro-v1-1-220a38d49507@weissschuh.net
Signed-off-by: Geert Uytterhoeven <[email protected]>
  • Loading branch information
t-8ch authored and geertu committed Jan 8, 2025
1 parent f603143 commit 738fa3f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/zorro/zorro-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ static struct attribute *zorro_device_attrs[] = {
};

static ssize_t zorro_read_config(struct file *filp, struct kobject *kobj,
struct bin_attribute *bin_attr,
const struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
{
struct zorro_dev *z = to_zorro_dev(kobj_to_dev(kobj));
Expand All @@ -98,23 +98,23 @@ static ssize_t zorro_read_config(struct file *filp, struct kobject *kobj,
return memory_read_from_buffer(buf, count, &off, &cd, sizeof(cd));
}

static struct bin_attribute zorro_config_attr = {
static const struct bin_attribute zorro_config_attr = {
.attr = {
.name = "config",
.mode = S_IRUGO,
},
.size = sizeof(struct ConfigDev),
.read = zorro_read_config,
.read_new = zorro_read_config,
};

static struct bin_attribute *zorro_device_bin_attrs[] = {
static const struct bin_attribute *const zorro_device_bin_attrs[] = {
&zorro_config_attr,
NULL
};

static const struct attribute_group zorro_device_attr_group = {
.attrs = zorro_device_attrs,
.bin_attrs = zorro_device_bin_attrs,
.bin_attrs_new = zorro_device_bin_attrs,
};

const struct attribute_group *zorro_device_attribute_groups[] = {
Expand Down

0 comments on commit 738fa3f

Please sign in to comment.