Commit 3c39919a authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Bjorn Helgaas
Browse files

PCI/VPD: 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.

Link: https://lore.kernel.org/r/20241202-sysfs-const-bin_attr-pci-v1-2-c32360f495a7@weissschuh.net


Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 0530ad48

drivers/pci/vpd.c

+7 −7
Original line number Diff line number Diff line
@@ -271,8 +271,8 @@ void pci_vpd_init(struct pci_dev *dev) 
}



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

			struct bin_attribute *bin_attr, char *buf, loff_t off,

			size_t count)

			const struct bin_attribute *bin_attr, char *buf,

			loff_t off, size_t count)

{

	struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj));

	struct pci_dev *vpd_dev = dev;
@@ -295,8 +295,8 @@ static ssize_t vpd_read(struct file *filp, struct kobject *kobj, 
}



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

			 struct bin_attribute *bin_attr, char *buf, loff_t off,

			 size_t count)

			 const struct bin_attribute *bin_attr, char *buf,

			 loff_t off, size_t count)

{

	struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj));

	struct pci_dev *vpd_dev = dev;
@@ -317,9 +317,9 @@ static ssize_t vpd_write(struct file *filp, struct kobject *kobj, 


	return ret;

}

static BIN_ATTR(vpd, 0600, vpd_read, vpd_write, 0);

static const BIN_ATTR(vpd, 0600, vpd_read, vpd_write, 0);



static struct bin_attribute *vpd_attrs[] = {

static const struct bin_attribute *const vpd_attrs[] = {

	&bin_attr_vpd,

	NULL,

};
@@ -336,7 +336,7 @@ static umode_t vpd_attr_is_visible(struct kobject *kobj, 
}



const struct attribute_group pci_dev_vpd_attr_group = {

	.bin_attrs = vpd_attrs,

	.bin_attrs_new = vpd_attrs,

	.is_bin_visible = vpd_attr_is_visible,

};