p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iommu/vt-d: Unlink device if failed to add to group 

If the device fails to be added to the group, make sure to unlink the
reference before returning.

Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
Fixes: 39ab9555c2 ("iommu: Add sysfs bindings for struct iommu_device")
Acked-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Jon Derrick 2019-12-31 13:24:20 -07:00 committed by Joerg Roedel
parent 7d4e6ccd1f
commit f78947c409
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/iommu/intel-iommu.c
View File

@ -5624,8 +5624,10 @@ static int intel_iommu_add_device(struct device *dev)
group = iommu_group_get_for_dev(dev); group = iommu_group_get_for_dev(dev);
if (IS_ERR(group)) if (IS_ERR(group)) {
return PTR_ERR(group); ret = PTR_ERR(group);
goto unlink;
}
iommu_group_put(group); iommu_group_put(group);
@ -5651,7 +5653,8 @@ static int intel_iommu_add_device(struct device *dev)
if (!get_private_domain_for_dev(dev)) { if (!get_private_domain_for_dev(dev)) {
dev_warn(dev, dev_warn(dev,
"Failed to get a private domain.\n"); "Failed to get a private domain.\n");
return -ENOMEM; ret = -ENOMEM;
goto unlink;
} }
dev_info(dev, dev_info(dev,
@ -5666,6 +5669,10 @@ static int intel_iommu_add_device(struct device *dev)
} }
return 0; return 0;
unlink:
iommu_device_unlink(&iommu->iommu, dev);
return ret;
} }
static void intel_iommu_remove_device(struct device *dev) static void intel_iommu_remove_device(struct device *dev)