Skip to content

Commit

Permalink
iommu: Fix a leak in iommu_insert_resv_region
Browse files Browse the repository at this point in the history
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: 6c65fb3 ("iommu: iommu_get_group_resv_regions")

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
  • Loading branch information
eauger authored and joergroedel committed Jun 12, 2019
1 parent 2de03c1 commit ad0834d
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/iommu/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,18 +237,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;
}
Expand All @@ -261,7 +264,6 @@ static int iommu_insert_resv_region(struct iommu_resv_region *new,
return -ENOMEM;

list_add_tail(&region->list, pos);
done:
return 0;
}

Expand Down

0 comments on commit ad0834d

Please sign in to comment.