[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230608021933.856045-1-suhui@nfschina.com>
Date: Thu, 8 Jun 2023 10:19:34 +0800
From: Su Hui <suhui@...china.com>
To: Joerg Roedel <joro@...tes.org>,
Suravee Suthikulpanit <suravee.suthikulpanit@....com>,
Will Deacon <will@...nel.org>,
Robin Murphy <robin.murphy@....com>
Cc: kevin.tian@...el.com, vasant.hegde@....com, jgg@...pe.ca,
iommu@...ts.linux.dev, linux-kernel@...r.kernel.org,
Su Hui <suhui@...china.com>
Subject: [PATCH v2] iommu/amd: Fix possible memory leak of 'domain'
Move allocation code down to avoid memory leak.
Fixes: 29f54745f245 ("iommu/amd: Add missing domain type checks")
Signed-off-by: Su Hui <suhui@...china.com>
---
Changes in v2:
change code order is better and more consistent with other
drivers.
drivers/iommu/amd/iommu.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
index dc1ec6849775..e8a2e5984acb 100644
--- a/drivers/iommu/amd/iommu.c
+++ b/drivers/iommu/amd/iommu.c
@@ -2078,10 +2078,6 @@ static struct protection_domain *protection_domain_alloc(unsigned int type)
int mode = DEFAULT_PGTABLE_LEVEL;
int ret;
- domain = kzalloc(sizeof(*domain), GFP_KERNEL);
- if (!domain)
- return NULL;
-
/*
* Force IOMMU v1 page table when iommu=pt and
* when allocating domain for pass-through devices.
@@ -2097,6 +2093,10 @@ static struct protection_domain *protection_domain_alloc(unsigned int type)
return NULL;
}
+ domain = kzalloc(sizeof(*domain), GFP_KERNEL);
+ if (!domain)
+ return NULL;
+
switch (pgtable) {
case AMD_IOMMU_V1:
ret = protection_domain_init_v1(domain, mode);
--
2.30.2
Powered by blists - more mailing lists