Commit 5943c0dc authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Greg Kroah-Hartman
Browse files

driver core: Constify bin_attribute definitions 



Mark all 'struct bin_attribute' instances as const to protect against
accidental and malicious modifications.

Signed-off-by: default avatarThomas 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 906c508a

drivers/base/node.c

+4 −4
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static inline ssize_t cpumap_read(struct file *file, struct kobject *kobj, 
	return n;

}



static BIN_ATTR_RO(cpumap, CPUMAP_FILE_MAX_BYTES);

static const BIN_ATTR_RO(cpumap, CPUMAP_FILE_MAX_BYTES);



static inline ssize_t cpulist_read(struct file *file, struct kobject *kobj,

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

}



static BIN_ATTR_RO(cpulist, CPULIST_FILE_MAX_BYTES);

static const BIN_ATTR_RO(cpulist, CPULIST_FILE_MAX_BYTES);



/**

 * struct node_access_nodes - Access class device to hold user visible
@@ -578,7 +578,7 @@ static struct attribute *node_dev_attrs[] = { 
	NULL

};



static struct bin_attribute *node_dev_bin_attrs[] = {

static const struct bin_attribute *node_dev_bin_attrs[] = {

	&bin_attr_cpumap,

	&bin_attr_cpulist,

	NULL
@@ -586,7 +586,7 @@ static struct bin_attribute *node_dev_bin_attrs[] = { 


static const struct attribute_group node_dev_group = {

	.attrs = node_dev_attrs,

	.bin_attrs = node_dev_bin_attrs

	.bin_attrs_new = node_dev_bin_attrs,

};



static const struct attribute_group *node_dev_groups[] = {

drivers/base/topology.c

+18 −18
Original line number Diff line number Diff line
@@ -62,50 +62,50 @@ define_id_show_func(ppin, "0x%llx"); 
static DEVICE_ATTR_ADMIN_RO(ppin);



define_siblings_read_func(thread_siblings, sibling_cpumask);

static BIN_ATTR_RO(thread_siblings, CPUMAP_FILE_MAX_BYTES);

static BIN_ATTR_RO(thread_siblings_list, CPULIST_FILE_MAX_BYTES);

static const BIN_ATTR_RO(thread_siblings, CPUMAP_FILE_MAX_BYTES);

static const BIN_ATTR_RO(thread_siblings_list, CPULIST_FILE_MAX_BYTES);



define_siblings_read_func(core_cpus, sibling_cpumask);

static BIN_ATTR_RO(core_cpus, CPUMAP_FILE_MAX_BYTES);

static BIN_ATTR_RO(core_cpus_list, CPULIST_FILE_MAX_BYTES);

static const BIN_ATTR_RO(core_cpus, CPUMAP_FILE_MAX_BYTES);

static const BIN_ATTR_RO(core_cpus_list, CPULIST_FILE_MAX_BYTES);



define_siblings_read_func(core_siblings, core_cpumask);

static BIN_ATTR_RO(core_siblings, CPUMAP_FILE_MAX_BYTES);

static BIN_ATTR_RO(core_siblings_list, CPULIST_FILE_MAX_BYTES);

static const BIN_ATTR_RO(core_siblings, CPUMAP_FILE_MAX_BYTES);

static const BIN_ATTR_RO(core_siblings_list, CPULIST_FILE_MAX_BYTES);



#ifdef TOPOLOGY_CLUSTER_SYSFS

define_siblings_read_func(cluster_cpus, cluster_cpumask);

static BIN_ATTR_RO(cluster_cpus, CPUMAP_FILE_MAX_BYTES);

static BIN_ATTR_RO(cluster_cpus_list, CPULIST_FILE_MAX_BYTES);

static const BIN_ATTR_RO(cluster_cpus, CPUMAP_FILE_MAX_BYTES);

static const BIN_ATTR_RO(cluster_cpus_list, CPULIST_FILE_MAX_BYTES);

#endif



#ifdef TOPOLOGY_DIE_SYSFS

define_siblings_read_func(die_cpus, die_cpumask);

static BIN_ATTR_RO(die_cpus, CPUMAP_FILE_MAX_BYTES);

static BIN_ATTR_RO(die_cpus_list, CPULIST_FILE_MAX_BYTES);

static const BIN_ATTR_RO(die_cpus, CPUMAP_FILE_MAX_BYTES);

static const BIN_ATTR_RO(die_cpus_list, CPULIST_FILE_MAX_BYTES);

#endif



define_siblings_read_func(package_cpus, core_cpumask);

static BIN_ATTR_RO(package_cpus, CPUMAP_FILE_MAX_BYTES);

static BIN_ATTR_RO(package_cpus_list, CPULIST_FILE_MAX_BYTES);

static const BIN_ATTR_RO(package_cpus, CPUMAP_FILE_MAX_BYTES);

static const BIN_ATTR_RO(package_cpus_list, CPULIST_FILE_MAX_BYTES);



#ifdef TOPOLOGY_BOOK_SYSFS

define_id_show_func(book_id, "%d");

static DEVICE_ATTR_RO(book_id);

define_siblings_read_func(book_siblings, book_cpumask);

static BIN_ATTR_RO(book_siblings, CPUMAP_FILE_MAX_BYTES);

static BIN_ATTR_RO(book_siblings_list, CPULIST_FILE_MAX_BYTES);

static const BIN_ATTR_RO(book_siblings, CPUMAP_FILE_MAX_BYTES);

static const BIN_ATTR_RO(book_siblings_list, CPULIST_FILE_MAX_BYTES);

#endif



#ifdef TOPOLOGY_DRAWER_SYSFS

define_id_show_func(drawer_id, "%d");

static DEVICE_ATTR_RO(drawer_id);

define_siblings_read_func(drawer_siblings, drawer_cpumask);

static BIN_ATTR_RO(drawer_siblings, CPUMAP_FILE_MAX_BYTES);

static BIN_ATTR_RO(drawer_siblings_list, CPULIST_FILE_MAX_BYTES);

static const BIN_ATTR_RO(drawer_siblings, CPUMAP_FILE_MAX_BYTES);

static const BIN_ATTR_RO(drawer_siblings_list, CPULIST_FILE_MAX_BYTES);

#endif



static struct bin_attribute *bin_attrs[] = {

static const struct bin_attribute *const bin_attrs[] = {

	&bin_attr_core_cpus,

	&bin_attr_core_cpus_list,

	&bin_attr_thread_siblings,
@@ -163,7 +163,7 @@ static umode_t topology_is_visible(struct kobject *kobj, 


static const struct attribute_group topology_attr_group = {

	.attrs = default_attrs,

	.bin_attrs = bin_attrs,

	.bin_attrs_new = bin_attrs,

	.is_visible = topology_is_visible,

	.name = "topology"

};