diff options
| author | Joerg Roedel | 2014-08-21 22:32:08 +0200 |
|---|---|---|
| committer | Joerg Roedel | 2014-08-26 11:15:10 +0200 |
| commit | c4a783b89ee3fc1201510ecf204278da4ccb0993 (patch) | |
| tree | f8b102520f6780736cfc21c4d948d3e1ae78ac69 | |
| parent | Linux 3.17-rc2 (diff) | |
| download | kernel-qcow2-linux-c4a783b89ee3fc1201510ecf204278da4ccb0993.tar.gz kernel-qcow2-linux-c4a783b89ee3fc1201510ecf204278da4ccb0993.tar.xz kernel-qcow2-linux-c4a783b89ee3fc1201510ecf204278da4ccb0993.zip | |
iommu/core: Make iommu_group_get_for_dev() more robust
When a non-PCI device is passed to that function it might
pass group == NULL to iommu_group_add_device() which then
dereferences it and cause a crash this way. Fix it by
just returning an error for non-PCI devices.
Fixes: 104a1c13ac66e40cf8c6ae74d76ff14ff24b9b01
Cc: Alex Williamson <alex.williamson@redhat.com>
Acked-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
| -rw-r--r-- | drivers/iommu/iommu.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index ac4adb337038..0639b9274b11 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -678,15 +678,17 @@ static struct iommu_group *iommu_group_get_for_pci_dev(struct pci_dev *pdev) */ struct iommu_group *iommu_group_get_for_dev(struct device *dev) { - struct iommu_group *group = ERR_PTR(-EIO); + struct iommu_group *group; int ret; group = iommu_group_get(dev); if (group) return group; - if (dev_is_pci(dev)) - group = iommu_group_get_for_pci_dev(to_pci_dev(dev)); + if (!dev_is_pci(dev)) + return ERR_PTR(-EINVAL); + + group = iommu_group_get_for_pci_dev(to_pci_dev(dev)); if (IS_ERR(group)) return group; |