Commit 70730db0 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI/VPD: Check Resource Item Names against those valid for type 



Previously, we checked for PCI_VPD_STIN_END, PCI_VPD_LTIN_ID_STRING, etc.,
outside the Large and Small Resource cases, so we checked Large Resource
Item Names against a Small Resource name and vice versa.

Move these tests into the Large and Small Resource cases, so we only check
PCI_VPD_STIN_END for Small Resources and PCI_VPD_LTIN_* for Large
Resources.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
parent e2cdd86b

drivers/pci/vpd.c

+6 −12
Original line number Diff line number Diff line
@@ -98,24 +98,18 @@ static size_t pci_vpd_size(struct pci_dev *dev, size_t old_size) 
				}

				off += PCI_VPD_LRDT_TAG_SIZE +

					pci_vpd_lrdt_size(header);

			} else {

				pci_warn(dev, "invalid large VPD tag %02x at offset %zu\n",

					 tag, off);

				return 0;

			}

		} else {

			/* Short Resource Data Type Tag */

			off += PCI_VPD_SRDT_TAG_SIZE +

				pci_vpd_srdt_size(header);

			tag = pci_vpd_srdt_tag(header);

		}



			if (tag == PCI_VPD_STIN_END)	/* End tag descriptor */

				return off;



		if ((tag != PCI_VPD_LTIN_ID_STRING) &&

		    (tag != PCI_VPD_LTIN_RO_DATA) &&

		    (tag != PCI_VPD_LTIN_RW_DATA)) {

			pci_warn(dev, "invalid %s VPD tag %02x at offset %zu",

				 (header[0] & PCI_VPD_LRDT) ? "large" : "short",

				 tag, off);

			return 0;

		}

	}

	return 0;