Commit ef37c669 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Alexander Gordeev
Browse files

s390/pci: Constify 'struct bin_attribute' 



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: default avatarThomas Weißschuh <linux@weissschuh.net>
Acked-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Link: https://lore.kernel.org/r/20241211-sysfs-const-bin_attr-s390-v1-3-be01f66bfcf7@weissschuh.net


Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
parent 77977da7

arch/s390/pci/pci_sysfs.c

+6 −6
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static ssize_t recover_store(struct device *dev, struct device_attribute *attr, 
static DEVICE_ATTR_WO(recover);



static ssize_t util_string_read(struct file *filp, struct kobject *kobj,

				struct bin_attribute *attr, char *buf,

				const struct bin_attribute *attr, char *buf,

				loff_t off, size_t count)

{

	struct device *dev = kobj_to_dev(kobj);
@@ -145,10 +145,10 @@ static ssize_t util_string_read(struct file *filp, struct kobject *kobj, 
	return memory_read_from_buffer(buf, count, &off, zdev->util_str,

				       sizeof(zdev->util_str));

}

static BIN_ATTR_RO(util_string, CLP_UTIL_STR_LEN);

static const BIN_ATTR_RO(util_string, CLP_UTIL_STR_LEN);



static ssize_t report_error_write(struct file *filp, struct kobject *kobj,

				  struct bin_attribute *attr, char *buf,

				  const struct bin_attribute *attr, char *buf,

				  loff_t off, size_t count)

{

	struct zpci_report_error_header *report = (void *) buf;
@@ -164,7 +164,7 @@ static ssize_t report_error_write(struct file *filp, struct kobject *kobj, 


	return ret ? ret : count;

}

static BIN_ATTR(report_error, S_IWUSR, NULL, report_error_write, PAGE_SIZE);

static const BIN_ATTR(report_error, S_IWUSR, NULL, report_error_write, PAGE_SIZE);



static ssize_t uid_is_unique_show(struct device *dev,

				  struct device_attribute *attr, char *buf)
@@ -203,7 +203,7 @@ const struct attribute_group zpci_ident_attr_group = { 
	.is_visible = zpci_index_is_visible,

};



static struct bin_attribute *zpci_bin_attrs[] = {

static const struct bin_attribute *const zpci_bin_attrs[] = {

	&bin_attr_util_string,

	&bin_attr_report_error,

	NULL,
@@ -227,7 +227,7 @@ static struct attribute *zpci_dev_attrs[] = { 


const struct attribute_group zpci_attr_group = {

	.attrs = zpci_dev_attrs,

	.bin_attrs = zpci_bin_attrs,

	.bin_attrs_new = zpci_bin_attrs,

};



static struct attribute *pfip_attrs[] = {