lkml.org 
[lkml]   [2015]   [Oct]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] pci: Update VPD size with correct length
Date
PCI-2.2 VPD entries have a maximum size of 32k, but might actually
be smaller than that. To figure out the actual size one has to read
the VPD area until the 'end marker' is reached.
Trying to read VPD data beyond that marker results in 'interesting'
effects, from simple read errors to crashing the card.
This path modifies the attribute size to the avialable VPD size.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/pci/access.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)

diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index 6bc9b12..4f8208e 100644
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -409,6 +409,34 @@ static int pci_vpd_f0_dev_check(struct pci_dev *dev)
return ret;
}

+/**
+ * pci_vpd_size - determine actual size of Vital Product Data
+ * @dev: pci device struct
+ * @old_size: current assumed size, also maximum allowed size
+ *
+ */
+size_t
+pci_vpd_pci22_size(struct pci_dev *dev, size_t old_size)
+{
+ loff_t off = 0;
+ unsigned char header[1+2]; /* 1 byte tag, 2 bytes length */
+
+ while (off < old_size && pci_read_vpd(dev, off, 1, header)) {
+ if (header[0] == 0x78) /* End tag descriptor */
+ return off + 1;
+ if (header[0] & 0x80) {
+ /* Large Resource Data Type Tag */
+ if (pci_read_vpd(dev, off+1, 2, &header[1]) != 2)
+ return off + 1;
+ off += 3 + ((header[2] << 8) | header[1]);
+ } else {
+ /* Short Resource Data Type Tag */
+ off += 1 + (header[0] & 0x07);
+ }
+ }
+ return old_size;
+}
+
int pci_vpd_pci22_init(struct pci_dev *dev)
{
struct pci_vpd_pci22 *vpd;
@@ -436,6 +464,7 @@ int pci_vpd_pci22_init(struct pci_dev *dev)
vpd->cap = cap;
vpd->busy = false;
dev->vpd = &vpd->base;
+ vpd->base.len = pci_vpd_pci22_size(dev, vpd->base.len);
return 0;
}

--
1.8.5.6


\
 
 \ /
  Last update: 2015-10-23 11:41    [W:0.072 / U:0.708 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site