summary refs log tree commit diff
path: root/drivers/iommu
diff options
context:
space:
mode:
authorNicholas Krause <xerofoify@gmail.com>2016-01-04 18:27:57 -0500
committerJoerg Roedel <jroedel@suse.de>2016-01-07 13:43:56 +0100
commit592033790e8276f7038efb480871598648464a01 (patch)
tree375165f1ab8b06e8071952edcab9f23b303a9300 /drivers/iommu
parent168309855a7d1e16db751e9c647119fe2d2dc878 (diff)
downloadlinux-592033790e8276f7038efb480871598648464a01.tar.gz
iommu/vt-d: Check the return value of iommu_device_create()
This adds the proper check to alloc_iommu to make sure that
the call to iommu_device_create has completed successfully
and if not return the error code to the caller after freeing
up resources allocated previously.

Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/dmar.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index 80e3c176008e..add177a37f00 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -1070,6 +1070,12 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd)
 						       intel_iommu_groups,
 						       "%s", iommu->name);
 
+	if (IS_ERR(iommu->iommu_dev)) {
+		drhd->iommu = NULL;
+		err = PTR_ERR(iommu->iommu_dev);
+		goto err_unmap;
+	}
+
 	return 0;
 
 err_unmap: