Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4a783b8 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

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: 104a1c13
Cc: Alex Williamson <alex.williamson@redhat.com>
Acked-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 52addcf9

drivers/iommu/iommu.c

+5 −3
Original line number Diff line number Diff line
@@ -678,14 +678,16 @@ 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))

	if (!dev_is_pci(dev))

		return ERR_PTR(-EINVAL);



	group = iommu_group_get_for_pci_dev(to_pci_dev(dev));



	if (IS_ERR(group))