diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2016-05-31 21:25:52 -0600 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2016-05-31 21:25:52 -0600 |
| commit | ce7585f3c4d76bca1dff4b66ae1ea32552954f9e (patch) | |
| tree | bdaa94825fb400c596b5ddac362d55c0f25680fe /drivers/vfio | |
| parent | 089f1c6b2daeab750fd92a28529928bc13c95d97 (diff) | |
| download | linux-stable-ce7585f3c4d76bca1dff4b66ae1ea32552954f9e.tar.gz linux-stable-ce7585f3c4d76bca1dff4b66ae1ea32552954f9e.tar.bz2 linux-stable-ce7585f3c4d76bca1dff4b66ae1ea32552954f9e.zip | |
vfio/pci: Allow VPD short read
The size of the VPD area is not necessarily 4-byte aligned, so a
pci_vpd_read() might return less than 4 bytes. Zero our buffer and
accept anything other than an error. Intel X710 NICs exercise this.
Fixes: 4e1a635552d3 ("vfio/pci: Use kernel VPD access functions")
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'drivers/vfio')
| -rw-r--r-- | drivers/vfio/pci/vfio_pci_config.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c index 93601407dab8..688691d9058d 100644 --- a/drivers/vfio/pci/vfio_pci_config.c +++ b/drivers/vfio/pci/vfio_pci_config.c @@ -749,7 +749,8 @@ static int vfio_vpd_config_write(struct vfio_pci_device *vdev, int pos, if (pci_write_vpd(pdev, addr & ~PCI_VPD_ADDR_F, 4, &data) != 4) return count; } else { - if (pci_read_vpd(pdev, addr, 4, &data) != 4) + data = 0; + if (pci_read_vpd(pdev, addr, 4, &data) < 0) return count; *pdata = cpu_to_le32(data); } |