Commit 0ee74d5a authored by Rolf Eike Beer's avatar Rolf Eike Beer Committed by Joerg Roedel
Browse files

iommu/vt-d: Fix sysfs leak in alloc_iommu() 



iommu_device_sysfs_add() is called before, so is has to be cleaned on subsequent
errors.

Fixes: 39ab9555 ("iommu: Add sysfs bindings for struct iommu_device")
Cc: stable@vger.kernel.org # 4.11.x
Signed-off-by: default avatarRolf Eike Beer <eb@emlix.com>
Acked-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/17411490.HIIP88n32C@mobilepool36.emlix.com
Link: https://lore.kernel.org/r/20210525070802.361755-2-baolu.lu@linux.intel.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 54c80d90

drivers/iommu/intel/dmar.c

+3 −1
Original line number Diff line number Diff line
@@ -1142,7 +1142,7 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) 


		err = iommu_device_register(&iommu->iommu, &intel_iommu_ops, NULL);

		if (err)

			goto err_unmap;

			goto err_sysfs;

	}



	drhd->iommu = iommu;
@@ -1150,6 +1150,8 @@ static int alloc_iommu(struct dmar_drhd_unit *drhd) 


	return 0;



err_sysfs:

	iommu_device_sysfs_remove(&iommu->iommu);

err_unmap:

	unmap_iommu(iommu);

error_free_seq_id: