From: Yuan Can <yuancan@huawei.com>
To: <joro@8bytes.org>, <will@kernel.org>, <robin.murphy@arm.com>,
<iommu@lists.linux.dev>
Cc: <linux-kernel@vger.kernel.org>, <yuancan@huawei.com>
Subject: [PATCH] iommu: fix resource leak in iommu_group_alloc
Date: Mon, 29 Aug 2022 07:11:25 +0000 [thread overview]
Message-ID: <20220829071125.104173-1-yuancan@huawei.com> (raw)
When it fails to create file for reserved_regions and type
of an iommu_group, the iommu_group_alloc returns ERR_PTR
without releasing the iommu_group.
Add error handling to cleanup leaking resources.
Signed-off-by: Yuan Can <yuancan@huawei.com>
---
drivers/iommu/iommu.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 1ca59afc8472..fff23231b5fc 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -675,15 +675,22 @@ struct iommu_group *iommu_group_alloc(void)
ret = iommu_group_create_file(group,
&iommu_group_attr_reserved_regions);
if (ret)
- return ERR_PTR(ret);
+ goto out_put_group;
ret = iommu_group_create_file(group, &iommu_group_attr_type);
if (ret)
- return ERR_PTR(ret);
+ goto out_remove_file;
pr_debug("Allocated group %d\n", group->id);
return group;
+
+out_remove_file:
+ iommu_group_remove_file(group, &iommu_group_attr_reserved_regions);
+out_put_group:
+ iommu_group_put(group);
+
+ return ERR_PTR(ret);
}
EXPORT_SYMBOL_GPL(iommu_group_alloc);
--
2.17.1
reply other threads:[~2022-08-29 7:13 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220829071125.104173-1-yuancan@huawei.com \
--to=yuancan@huawei.com \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).