| From 198bc3252ea3a45b0c5d500e6a5b91cfdd08f001 Mon Sep 17 00:00:00 2001 |
| From: Gerald Schaefer <gerald.schaefer@de.ibm.com> |
| Date: Wed, 16 Jan 2019 20:11:44 +0100 |
| Subject: iommu/vt-d: Fix memory leak in intel_iommu_put_resv_regions() |
| |
| From: Gerald Schaefer <gerald.schaefer@de.ibm.com> |
| |
| commit 198bc3252ea3a45b0c5d500e6a5b91cfdd08f001 upstream. |
| |
| Commit 9d3a4de4cb8d ("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: 9d3a4de4cb8d ("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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/iommu/intel-iommu.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/iommu/intel-iommu.c |
| +++ b/drivers/iommu/intel-iommu.c |
| @@ -5204,7 +5204,7 @@ static void intel_iommu_put_resv_regions |
| 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); |
| } |
| } |