diff options
| author | Eric Auger | 2019-06-03 08:53:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-07-26 09:14:06 +0200 |
| commit | 79644b600850bc0102dbb44dca66069dc48441d8 (patch) | |
| tree | ca13779392d2e822deb4fb80a69f1d45db440c26 | |
| parent | media: fdp1: Support M3N and E3 platforms (diff) | |
| download | kernel-qcow2-linux-79644b600850bc0102dbb44dca66069dc48441d8.tar.gz kernel-qcow2-linux-79644b600850bc0102dbb44dca66069dc48441d8.tar.xz kernel-qcow2-linux-79644b600850bc0102dbb44dca66069dc48441d8.zip | |
iommu: Fix a leak in iommu_insert_resv_region
[ Upstream commit ad0834dedaa15c3a176f783c0373f836e44b4700 ]
In case we expand an existing region, we unlink
this latter and insert the larger one. In
that case we should free the original region after
the insertion. Also we can immediately return.
Fixes: 6c65fb318e8b ("iommu: iommu_get_group_resv_regions")
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/iommu/iommu.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 8c15c5980299..bc14825edc9c 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -211,18 +211,21 @@ static int iommu_insert_resv_region(struct iommu_resv_region *new, pos = pos->next; } else if ((start >= a) && (end <= b)) { if (new->type == type) - goto done; + return 0; else pos = pos->next; } else { if (new->type == type) { phys_addr_t new_start = min(a, start); phys_addr_t new_end = max(b, end); + int ret; list_del(&entry->list); entry->start = new_start; entry->length = new_end - new_start + 1; - iommu_insert_resv_region(entry, regions); + ret = iommu_insert_resv_region(entry, regions); + kfree(entry); + return ret; } else { pos = pos->next; } @@ -235,7 +238,6 @@ insert: return -ENOMEM; list_add_tail(®ion->list, pos); -done: return 0; } |