lkml.org 
[lkml]   [2021]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 085/127] iommu/dma: Fix leak in non-contiguous API
    Date
    From: Ezequiel Garcia <ezequiel@collabora.com>

    [ Upstream commit 0fbea680540108b09db7b26d9f4d24236d58a6ad ]

    Currently, iommu_dma_alloc_noncontiguous() allocates a
    struct dma_sgt_handle object to hold some state needed for
    iommu_dma_free_noncontiguous().

    However, the handle is neither freed nor returned explicitly by
    the ->alloc_noncontiguous method, and therefore seems leaked.
    This was found by code inspection, so please review carefully and test.

    As a side note, it appears the struct dma_sgt_handle type is exposed
    to users of the DMA-API by linux/dma-map-ops.h, but is has no users
    or functions returning the type explicitly.

    This may indicate it's a good idea to move the struct dma_sgt_handle type
    to drivers/iommu/dma-iommu.c. The decision is left to maintainers :-)

    Cc: stable@vger.kernel.org
    Fixes: e817ee5f2f95c ("dma-iommu: implement ->alloc_noncontiguous")
    Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Link: https://lore.kernel.org/r/20210723010552.50969-1-ezequiel@collabora.com
    Signed-off-by: Joerg Roedel <jroedel@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/iommu/dma-iommu.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
    index 5d96fcc45fec..698707699327 100644
    --- a/drivers/iommu/dma-iommu.c
    +++ b/drivers/iommu/dma-iommu.c
    @@ -768,6 +768,7 @@ static void iommu_dma_free_noncontiguous(struct device *dev, size_t size,
    __iommu_dma_unmap(dev, sgt->sgl->dma_address, size);
    __iommu_dma_free_pages(sh->pages, PAGE_ALIGN(size) >> PAGE_SHIFT);
    sg_free_table(&sh->sgt);
    + kfree(sh);
    }
    #endif /* CONFIG_DMA_REMAP */

    --
    2.30.2
    \
     
     \ /
      Last update: 2021-08-24 19:02    [W:7.162 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site