p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PCI: Allow access to VPD attributes with size 0 

It is not always possible to determine the actual size of the VPD
data, so allow access to them if the size is set to '0'.

Tested-by: Shane Seymour <shane.seymour@hpe.com>
Tested-by: Babu Moger <babu.moger@oracle.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Alexander Duyck <alexander.duyck@gmail.com>
This commit is contained in:
Hannes Reinecke 2016-02-15 09:42:00 +01:00 committed by Bjorn Helgaas
parent 9eb45d5cc5
commit f52e5629f6
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/pci/pci-sysfs.c
View File

@ -769,10 +769,12 @@ static ssize_t read_vpd_attr(struct file *filp, struct kobject *kobj,
{ {
struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj)); struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj));
if (off > bin_attr->size) if (bin_attr->size > 0) {
count = 0; if (off > bin_attr->size)
else if (count > bin_attr->size - off) count = 0;
count = bin_attr->size - off; else if (count > bin_attr->size - off)
count = bin_attr->size - off;
}
return pci_read_vpd(dev, off, count, buf); return pci_read_vpd(dev, off, count, buf);
} }
@ -783,10 +785,12 @@ static ssize_t write_vpd_attr(struct file *filp, struct kobject *kobj,
{ {
struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj)); struct pci_dev *dev = to_pci_dev(kobj_to_dev(kobj));
if (off > bin_attr->size) if (bin_attr->size > 0) {
count = 0; if (off > bin_attr->size)
else if (count > bin_attr->size - off) count = 0;
count = bin_attr->size - off; else if (count > bin_attr->size - off)
count = bin_attr->size - off;
}
return pci_write_vpd(dev, off, count, buf); return pci_write_vpd(dev, off, count, buf);
} }