Commit 4daa8611 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Joerg Roedel
Browse files

iommu: Fix error unwind in iommu_group_alloc() 



If either iommu_group_grate_file() fails then the
iommu_group is leaked.

Destroy it on these error paths.

Found by kselftest/iommu/iommufd_fail_nth

Fixes: bc7d12b9 ("iommu: Implement reserved_regions iommu-group sysfs file")
Fixes: c52c72d3 ("iommu: Add sysfs attribyte for domain type")
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/0-v1-8f616bee028d+8b-iommu_group_alloc_leak_jgg@nvidia.com


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

drivers/iommu/iommu.c

+6 −2
Original line number Diff line number Diff line
@@ -798,12 +798,16 @@ struct iommu_group *iommu_group_alloc(void) 


	ret = iommu_group_create_file(group,

				      &iommu_group_attr_reserved_regions);

	if (ret)

	if (ret) {

		kobject_put(group->devices_kobj);

		return ERR_PTR(ret);

	}



	ret = iommu_group_create_file(group, &iommu_group_attr_type);

	if (ret)

	if (ret) {

		kobject_put(group->devices_kobj);

		return ERR_PTR(ret);

	}



	pr_debug("Allocated group %d\n", group->id);