Commit 7c2e211f authored by Wei Yang's avatar Wei Yang Committed by Alex Williamson

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: default avatarWei Yang <weiyang@linux.vnet.ibm.com>
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Cc: stable@vger.kernel.org # v3.6+
parent b1940cd2
...@@ -840,13 +840,11 @@ static const struct vfio_device_ops vfio_pci_ops = { ...@@ -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) static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{ {
u8 type;
struct vfio_pci_device *vdev; struct vfio_pci_device *vdev;
struct iommu_group *group; struct iommu_group *group;
int ret; int ret;
pci_read_config_byte(pdev, PCI_HEADER_TYPE, &type); if (pdev->hdr_type != PCI_HEADER_TYPE_NORMAL)
if ((type & PCI_HEADER_TYPE) != PCI_HEADER_TYPE_NORMAL)
return -EINVAL; return -EINVAL;
group = iommu_group_get(&pdev->dev); group = iommu_group_get(&pdev->dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment