[PATCH 3.13.y-ckt 033/103] vfio-pci: Fix the check on pci device type in vfio_pci_probe()

From: Kamal Mostafa
Date: Wed Feb 18 2015 - 19:34:12 EST

3.13.11-ckt16 -stable review patch. If anyone has any objections, please let me know.


From: Wei Yang <weiyang@xxxxxxxxxxxxxxxxxx>

commit 7c2e211f3c95b91912a92a8c6736343690042e2e upstream.

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@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Alex Williamson <alex.williamson@xxxxxxxxxx>
Signed-off-by: Kamal Mostafa <kamal@xxxxxxxxxxxxx>
drivers/vfio/pci/vfio_pci.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index 6ab71b9..275aa3fc 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -821,13 +821,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 (pdev->hdr_type != PCI_HEADER_TYPE_NORMAL)
return -EINVAL;

group = iommu_group_get(&pdev->dev);

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/