diff options
| author |   Wei Yang <weiyang@linux.vnet.ibm.com> | 2015-01-07 10:29:11 -0700 |
|---|---|---|
| committer |   Alex Williamson <alex.williamson@redhat.com> | 2015-01-07 10:29:11 -0700 |
| commit | 7c2e211f3c95b91912a92a8c6736343690042e2e (patch) | |
| tree | 2cbc83b9b08e1504fe283330915afdecc5e337db /drivers/vfio | |
| parent | Linux 3.19-rc3 (diff) | |
| download | linux-dev-7c2e211f3c95b91912a92a8c6736343690042e2e.tar.xz linux-dev-7c2e211f3c95b91912a92a8c6736343690042e2e.zip | |
vfio-pci: Fix the check on pci device type in vfio_pci_probe()
Current vfio-pci just supports normal pci device, so vfio_pci_probe() will
return if the pci device is not a normal device. While current code makes a
mistake. PCI_HEADER_TYPE is the offset in configuration space of the device
type, but we use this value to mask the type value.
This patch fixs this by do the check directly on the pci_dev->hdr_type.
Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Cc: stable@vger.kernel.org # v3.6+
Diffstat (limited to 'drivers/vfio')
| -rw-r--r-- | drivers/vfio/pci/vfio_pci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index 255201f22126..7cc0122a18ce 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -840,13 +840,11 @@ static const struct vfio_device_ops vfio_pci_ops = { static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) { - u8 type; struct vfio_pci_device *vdev; struct iommu_group *group; int ret; - pci_read_config_byte(pdev, PCI_HEADER_TYPE, &type); - if ((type & PCI_HEADER_TYPE) != PCI_HEADER_TYPE_NORMAL) + if (pdev->hdr_type != PCI_HEADER_TYPE_NORMAL) return -EINVAL; group = iommu_group_get(&pdev->dev); |