From: Jason Gunthorpe Date: Thu, 16 Feb 2023 01:21:16 +0000 (-0400) Subject: iommu: Fix error unwind in iommu_group_alloc() X-Git-Tag: v6.1.16~408 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4c23124b45ee0aa895ed8d5d08871ae6b15ee336;p=users%2Fdwmw2%2Flinux.git 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 Reviewed-by: Lu Baolu Link: https://lore.kernel.org/r/0-v1-8f616bee028d+8b-iommu_group_alloc_leak_jgg@nvidia.com Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 959d895fc1dff..fd8c8aeb3c504 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -749,12 +749,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);