iommu/vt-d: Fix memory leak in intel_iommu_put_resv_regions()

gerald-schaefer · joergroedel · commit 198bc3252ea3 · 2019-01-22T14:01:38.000+01:00
Commit 9d3a4de ("iommu: Disambiguate MSI region types") changed the reserved region type in intel_iommu_get_resv_regions() from IOMMU_RESV_RESERVED to IOMMU_RESV_MSI, but it forgot to also change the type in intel_iommu_put_resv_regions(). This leads to a memory leak, because now the check in intel_iommu_put_resv_regions() for IOMMU_RESV_RESERVED will never be true, and no allocated regions will be freed. Fix this by changing the region type in intel_iommu_put_resv_regions() to IOMMU_RESV_MSI, matching the type of the allocated regions. Fixes: 9d3a4de ("iommu: Disambiguate MSI region types") Cc: <stable@vger.kernel.org> # v4.11+ Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
@@ -5294,7 +5294,7 @@ static void intel_iommu_put_resv_regions(struct device *dev,
 	struct iommu_resv_region *entry, *next;
 
 	list_for_each_entry_safe(entry, next, head, list) {
-		if (entry->type == IOMMU_RESV_RESERVED)
+		if (entry->type == IOMMU_RESV_MSI)
 			kfree(entry);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -5294,7 +5294,7 @@ static void intel_iommu_put_resv_regions(struct device *dev,`
`5294`	`5294`	`struct iommu_resv_region entry, next;`
`5295`	`5295`
`5296`	`5296`	`list_for_each_entry_safe(entry, next, head, list) {`
`5297`		`- if (entry->type == IOMMU_RESV_RESERVED)`
	`5297`	`+ if (entry->type == IOMMU_RESV_MSI)`
`5298`	`5298`	`kfree(entry);`
`5299`	`5299`	`}`
`5300`	`5300`	`}`