Skip to content

Commit 5943c0d

Browse files
t-8chgregkh
authored andcommitted
driver core: Constify bin_attribute definitions
Mark all 'struct bin_attribute' instances as const to protect against accidental and malicious modifications. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Link: https://lore.kernel.org/r/20241115-b4-sysfs-const-bin_attr-group-v1-2-2c9bb12dfc48@weissschuh.net Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 906c508 commit 5943c0d

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

drivers/base/node.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static inline ssize_t cpumap_read(struct file *file, struct kobject *kobj,
4545
return n;
4646
}
4747

48-
static BIN_ATTR_RO(cpumap, CPUMAP_FILE_MAX_BYTES);
48+
static const BIN_ATTR_RO(cpumap, CPUMAP_FILE_MAX_BYTES);
4949

5050
static inline ssize_t cpulist_read(struct file *file, struct kobject *kobj,
5151
const struct bin_attribute *attr, char *buf,
@@ -66,7 +66,7 @@ static inline ssize_t cpulist_read(struct file *file, struct kobject *kobj,
6666
return n;
6767
}
6868

69-
static BIN_ATTR_RO(cpulist, CPULIST_FILE_MAX_BYTES);
69+
static const BIN_ATTR_RO(cpulist, CPULIST_FILE_MAX_BYTES);
7070

7171
/**
7272
* struct node_access_nodes - Access class device to hold user visible
@@ -578,15 +578,15 @@ static struct attribute *node_dev_attrs[] = {
578578
NULL
579579
};
580580

581-
static struct bin_attribute *node_dev_bin_attrs[] = {
581+
static const struct bin_attribute *node_dev_bin_attrs[] = {
582582
&bin_attr_cpumap,
583583
&bin_attr_cpulist,
584584
NULL
585585
};
586586

587587
static const struct attribute_group node_dev_group = {
588588
.attrs = node_dev_attrs,
589-
.bin_attrs = node_dev_bin_attrs
589+
.bin_attrs_new = node_dev_bin_attrs,
590590
};
591591

592592
static const struct attribute_group *node_dev_groups[] = {

drivers/base/topology.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -62,50 +62,50 @@ define_id_show_func(ppin, "0x%llx");
6262
static DEVICE_ATTR_ADMIN_RO(ppin);
6363

6464
define_siblings_read_func(thread_siblings, sibling_cpumask);
65-
static BIN_ATTR_RO(thread_siblings, CPUMAP_FILE_MAX_BYTES);
66-
static BIN_ATTR_RO(thread_siblings_list, CPULIST_FILE_MAX_BYTES);
65+
static const BIN_ATTR_RO(thread_siblings, CPUMAP_FILE_MAX_BYTES);
66+
static const BIN_ATTR_RO(thread_siblings_list, CPULIST_FILE_MAX_BYTES);
6767

6868
define_siblings_read_func(core_cpus, sibling_cpumask);
69-
static BIN_ATTR_RO(core_cpus, CPUMAP_FILE_MAX_BYTES);
70-
static BIN_ATTR_RO(core_cpus_list, CPULIST_FILE_MAX_BYTES);
69+
static const BIN_ATTR_RO(core_cpus, CPUMAP_FILE_MAX_BYTES);
70+
static const BIN_ATTR_RO(core_cpus_list, CPULIST_FILE_MAX_BYTES);
7171

7272
define_siblings_read_func(core_siblings, core_cpumask);
73-
static BIN_ATTR_RO(core_siblings, CPUMAP_FILE_MAX_BYTES);
74-
static BIN_ATTR_RO(core_siblings_list, CPULIST_FILE_MAX_BYTES);
73+
static const BIN_ATTR_RO(core_siblings, CPUMAP_FILE_MAX_BYTES);
74+
static const BIN_ATTR_RO(core_siblings_list, CPULIST_FILE_MAX_BYTES);
7575

7676
#ifdef TOPOLOGY_CLUSTER_SYSFS
7777
define_siblings_read_func(cluster_cpus, cluster_cpumask);
78-
static BIN_ATTR_RO(cluster_cpus, CPUMAP_FILE_MAX_BYTES);
79-
static BIN_ATTR_RO(cluster_cpus_list, CPULIST_FILE_MAX_BYTES);
78+
static const BIN_ATTR_RO(cluster_cpus, CPUMAP_FILE_MAX_BYTES);
79+
static const BIN_ATTR_RO(cluster_cpus_list, CPULIST_FILE_MAX_BYTES);
8080
#endif
8181

8282
#ifdef TOPOLOGY_DIE_SYSFS
8383
define_siblings_read_func(die_cpus, die_cpumask);
84-
static BIN_ATTR_RO(die_cpus, CPUMAP_FILE_MAX_BYTES);
85-
static BIN_ATTR_RO(die_cpus_list, CPULIST_FILE_MAX_BYTES);
84+
static const BIN_ATTR_RO(die_cpus, CPUMAP_FILE_MAX_BYTES);
85+
static const BIN_ATTR_RO(die_cpus_list, CPULIST_FILE_MAX_BYTES);
8686
#endif
8787

8888
define_siblings_read_func(package_cpus, core_cpumask);
89-
static BIN_ATTR_RO(package_cpus, CPUMAP_FILE_MAX_BYTES);
90-
static BIN_ATTR_RO(package_cpus_list, CPULIST_FILE_MAX_BYTES);
89+
static const BIN_ATTR_RO(package_cpus, CPUMAP_FILE_MAX_BYTES);
90+
static const BIN_ATTR_RO(package_cpus_list, CPULIST_FILE_MAX_BYTES);
9191

9292
#ifdef TOPOLOGY_BOOK_SYSFS
9393
define_id_show_func(book_id, "%d");
9494
static DEVICE_ATTR_RO(book_id);
9595
define_siblings_read_func(book_siblings, book_cpumask);
96-
static BIN_ATTR_RO(book_siblings, CPUMAP_FILE_MAX_BYTES);
97-
static BIN_ATTR_RO(book_siblings_list, CPULIST_FILE_MAX_BYTES);
96+
static const BIN_ATTR_RO(book_siblings, CPUMAP_FILE_MAX_BYTES);
97+
static const BIN_ATTR_RO(book_siblings_list, CPULIST_FILE_MAX_BYTES);
9898
#endif
9999

100100
#ifdef TOPOLOGY_DRAWER_SYSFS
101101
define_id_show_func(drawer_id, "%d");
102102
static DEVICE_ATTR_RO(drawer_id);
103103
define_siblings_read_func(drawer_siblings, drawer_cpumask);
104-
static BIN_ATTR_RO(drawer_siblings, CPUMAP_FILE_MAX_BYTES);
105-
static BIN_ATTR_RO(drawer_siblings_list, CPULIST_FILE_MAX_BYTES);
104+
static const BIN_ATTR_RO(drawer_siblings, CPUMAP_FILE_MAX_BYTES);
105+
static const BIN_ATTR_RO(drawer_siblings_list, CPULIST_FILE_MAX_BYTES);
106106
#endif
107107

108-
static struct bin_attribute *bin_attrs[] = {
108+
static const struct bin_attribute *const bin_attrs[] = {
109109
&bin_attr_core_cpus,
110110
&bin_attr_core_cpus_list,
111111
&bin_attr_thread_siblings,
@@ -163,7 +163,7 @@ static umode_t topology_is_visible(struct kobject *kobj,
163163

164164
static const struct attribute_group topology_attr_group = {
165165
.attrs = default_attrs,
166-
.bin_attrs = bin_attrs,
166+
.bin_attrs_new = bin_attrs,
167167
.is_visible = topology_is_visible,
168168
.name = "topology"
169169
};

0 commit comments

Comments
 (0)