iommu: Fix error unwind in iommu_group_alloc()

[ Upstream commit 4daa861174d56023c2068ddb03de0752f07fa199 ]

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: bc7d12b91bd3 ("iommu: Implement reserved_regions iommu-group sysfs file")
Fixes: c52c72d3dee8 ("iommu: Add sysfs attribyte for domain type")
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Lu 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: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 7f409e9eea4b76801856768724f1f94ca17f16ab..d06dbf035c7c7260452d8879be4870aaa0c267f4 100644 (file)
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -656,12 +656,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);