PCI: sysfs: Change DEVICE_ATTR() to DEVICE_ATTR_WO() (4e2b7943) · Commits · 戴 / test

DEVICE_ATTR() should only be used when files have unusual permissions. Change DEVICE_ATTR() with '0220' write-only permissions to DEVICE_ATTR_WO(), e.g., - static DEVICE_ATTR(_name, (S_IWUSR | S_IWGRP), NULL, _store); + static DEVICE_ATTR_WO(_name); Since _store is no longer passed, make the _name passed by DEVICE_ATTR_WO() and the related _name##_store() name match with each other, e.g., DEVICE_ATTR_WO(bus_rescan) must be able to call bus_rescan_store() Link: https://lore.kernel.org/r/20190815153352.86143-4-skunberg.kelsey@gmail.com Signed-off-by:

Kelsey Skunberg <skunberg.kelsey@gmail.com> Signed-off-by:

Bjorn Helgaas <bhelgaas@google.com> Reviewed-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by:

Donald Dutile <ddutile@redhat.com>

drivers/pci/pci-sysfs.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -464,7 +464,7 @@ static ssize_t dev_rescan_store(struct device *dev,
		}
		return count;
		}
		static DEVICE_ATTR(rescan, (S_IWUSR \| S_IWGRP), NULL, dev_rescan_store);
		static DEVICE_ATTR_WO(dev_rescan);

		static ssize_t remove_store(struct device dev, struct device_attribute attr,
		const char *buf, size_t count)
		@@ -481,7 +481,7 @@ static ssize_t remove_store(struct device dev, struct device_attribute attr,
		static DEVICE_ATTR_IGNORE_LOCKDEP(remove, (S_IWUSR \| S_IWGRP), NULL,
		remove_store);

		static ssize_t dev_bus_rescan_store(struct device *dev,
		static ssize_t bus_rescan_store(struct device *dev,
		struct device_attribute *attr,
		const char *buf, size_t count)
		{
		@@ -501,7 +501,7 @@ static ssize_t dev_bus_rescan_store(struct device *dev,
		}
		return count;
		}
		static DEVICE_ATTR(bus_rescan, (S_IWUSR \| S_IWGRP), NULL, dev_bus_rescan_store);
		static DEVICE_ATTR_WO(bus_rescan);

		#if defined(CONFIG_PM) && defined(CONFIG_ACPI)
		static ssize_t d3cold_allowed_store(struct device *dev,
		@@ -1620,7 +1620,7 @@ static umode_t pci_dev_attrs_are_visible(struct kobject *kobj,

		static struct attribute *pci_dev_hp_attrs[] = {
		&dev_attr_remove.attr,
		&dev_attr_rescan.attr,
		&dev_attr_dev_rescan.attr,
		NULL,
		};

Admin message