summaryrefslogtreecommitdiff
path: root/drivers/pci/vpd.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2021-07-15 16:59:58 -0500
committerBjorn Helgaas <bhelgaas@google.com>2021-08-09 13:43:09 -0500
commit7fa75dd8c64590850a54991a8bb914667c512b4c (patch)
treec240ac9eb8779e4df2e7474d438bcab80a49877c /drivers/pci/vpd.c
parent6303049d16f0e69d0449c3c80d0e3695d4f02f94 (diff)
PCI/VPD: Don't check Large Resource Item Names for validity
VPD consists of a series of Small and Large Resources. Computing the size of VPD requires only the length of each, which is specified in the generic tag of each resource. We only expect to see ID_STRING, RO_DATA, and RW_DATA in VPD, but it's not a problem if it contains other resource types because all we care about is the size. Drop the validity checking of Large Resource items. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Hannes Reinecke <hare@suse.de>
Diffstat (limited to 'drivers/pci/vpd.c')
-rw-r--r--drivers/pci/vpd.c27
1 files changed, 8 insertions, 19 deletions
diff --git a/drivers/pci/vpd.c b/drivers/pci/vpd.c
index 850deff0dd43..602d30220ec4 100644
--- a/drivers/pci/vpd.c
+++ b/drivers/pci/vpd.c
@@ -83,27 +83,16 @@ static size_t pci_vpd_size(struct pci_dev *dev, size_t old_size)
if (header[0] & PCI_VPD_LRDT) {
/* Large Resource Data Type Tag */
- tag = pci_vpd_lrdt_tag(header);
- /* Only read length from known tag items */
- if ((tag == PCI_VPD_LTIN_ID_STRING) ||
- (tag == PCI_VPD_LTIN_RO_DATA) ||
- (tag == PCI_VPD_LTIN_RW_DATA)) {
- if (pci_read_vpd(dev, off+1, 2,
- &header[1]) != 2) {
- pci_warn(dev, "failed VPD read at offset %zu\n",
- off + 1);
- return 0;
- }
- size = pci_vpd_lrdt_size(header);
- if (off + size > PCI_VPD_MAX_SIZE)
- goto error;
-
- off += PCI_VPD_LRDT_TAG_SIZE + size;
- } else {
- pci_warn(dev, "invalid large VPD tag %02x at offset %zu\n",
- tag, off);
+ if (pci_read_vpd(dev, off + 1, 2, &header[1]) != 2) {
+ pci_warn(dev, "failed VPD read at offset %zu\n",
+ off + 1);
return 0;
}
+ size = pci_vpd_lrdt_size(header);
+ if (off + size > PCI_VPD_MAX_SIZE)
+ goto error;
+
+ off += PCI_VPD_LRDT_TAG_SIZE + size;
} else {
/* Short Resource Data Type Tag */
tag = pci_vpd_srdt_tag(header);