lkml.org 
[lkml]   [2019]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 086/413] iommu: Fix a leak in iommu_insert_resv_region
    Date
    [ 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>
    ---
    drivers/iommu/iommu.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
    index 9f0a2844371c..30db41e9f15c 100644
    --- a/drivers/iommu/iommu.c
    +++ b/drivers/iommu/iommu.c
    @@ -225,18 +225,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;
    }
    @@ -249,7 +252,6 @@ static int iommu_insert_resv_region(struct iommu_resv_region *new,
    return -ENOMEM;

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

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-07-24 21:27    [W:4.033 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site