Eric Lee / smarc-ti-linux-kernel

3
Download as
Browse Code ยป

Commit 7c2e211f3c95b91912a92a8c6736343690042e2e

Authored by Wei Yang
Committed by Alex Williamson
1 parent b1940cd21c
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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+

Showing 1 changed file with 1 additions and 3 deletions Side-by-side Diff

drivers/vfio/pci/vfio_pci.c
Diff comments   View file @ 7c2e211
... ... @@ -840,13 +840,11 @@
840 840  
841 841 static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
842 842 {
843   - u8 type;
844 843 struct vfio_pci_device *vdev;
845 844 struct iommu_group *group;
846 845 int ret;
847 846  
848   - pci_read_config_byte(pdev, PCI_HEADER_TYPE, &type);
849   - if ((type & PCI_HEADER_TYPE) != PCI_HEADER_TYPE_NORMAL)
  847 + if (pdev->hdr_type != PCI_HEADER_TYPE_NORMAL)
850 848 return -EINVAL;
851 849  
852 850 group = iommu_group_get(&pdev->dev);