accel/amdxdna: Fix memory leak in amdxdna_ubuf_map
PATCH v2 1/1 accel/amdxdna: Fix memory leak in amdxdna_ubuf_map
From: Zishun Yi <[email protected]>
The amdxdna_ubuf_map() function allocates memory for sg and internal sg table structures, but it fails to free them if subsequent operations (sg_alloc_table_from_pages or dma_map_sgtable) fail.
---
v2: Add 'Fixes' tag
drivers/accel/amdxdna/amdxdna_ubuf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/accel/amdxdna/amdxdna_ubuf.c +8 -2
@@ -34,15 +34,21 @@ static struct sg_table *amdxdna_ubuf_map(struct dma_buf_attachment *attach, ret =sg_alloc_table_from_pages (sg, ubuf->pages, ubuf->nr_pages,0 , ubuf->nr_pages <<PAGE_SHIFT ,GFP_KERNEL );if (ret) -return ERR_PTR (ret); + goto err_free_sg;if (ubuf->flags &AMDXDNA_UBUF_FLAG_MAP_DMA ) { ret =dma_map_sgtable (attach->dev, sg, direction,0 );if (ret) -return ERR_PTR (ret); + goto err_free_table; }return sg; + +err_free_table: +sg_free_table (sg); +err_free_sg: +kfree (sg); +return ERR_PTR (ret); } static void amdxdna_ubuf_unmap(struct dma_buf_attachment *attach,
Signature · 1 line
2.51.2
Quoted 42 lines · zishun yi
From: Zishun Yi <[email protected]>
The
amdxdna_ubuf_map()function allocates memory for sg and internal sg table structures, but it fails to free them if subsequent operations (sg_alloc_table_from_pagesordma_map_sgtable) fail.Fixes bd72d4acda10 ("accel/amdxdna: Support user space allocated buffer")Signed-off-by Zishun Yi <[email protected]>---
v2: Add 'Fixes' tagdrivers/accel/amdxdna/amdxdna_ubuf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)drivers/accel/amdxdna/amdxdna_ubuf.c +8
-2@@ -34,15 +34,21 @@ static struct sg_table *amdxdna_ubuf_map(struct dma_buf_attachment *attach, ret =sg_alloc_table_from_pages (sg, ubuf->pages, ubuf->nr_pages,0 , ubuf->nr_pages <<PAGE_SHIFT ,GFP_KERNEL );if (ret) -return ERR_PTR (ret); + goto err_free_sg;if (ubuf->flags &AMDXDNA_UBUF_FLAG_MAP_DMA ) { ret =dma_map_sgtable (attach->dev, sg, direction,0 );if (ret) -return ERR_PTR (ret); + goto err_free_table; }return sg; + +err_free_table: +sg_free_table (sg); +err_free_sg: +kfree (sg); +return ERR_PTR (ret); } static void amdxdna_ubuf_unmap(struct dma_buf_attachment *attach,
Looks good.
Applied to drm-misc-next-fixes.
Quoted 42 lines · zishun yi
From: Zishun Yi <[email protected]>
The
amdxdna_ubuf_map()function allocates memory for sg and internal sg table structures, but it fails to free them if subsequent operations (sg_alloc_table_from_pagesordma_map_sgtable) fail.Fixes bd72d4acda10 ("accel/amdxdna: Support user space allocated buffer")Signed-off-by Zishun Yi <[email protected]>---
v2: Add 'Fixes' tagdrivers/accel/amdxdna/amdxdna_ubuf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)drivers/accel/amdxdna/amdxdna_ubuf.c +8
-2@@ -34,15 +34,21 @@ static struct sg_table *amdxdna_ubuf_map(struct dma_buf_attachment *attach, ret =sg_alloc_table_from_pages (sg, ubuf->pages, ubuf->nr_pages,0 , ubuf->nr_pages <<PAGE_SHIFT ,GFP_KERNEL );if (ret) -return ERR_PTR (ret); + goto err_free_sg;if (ubuf->flags &AMDXDNA_UBUF_FLAG_MAP_DMA ) { ret =dma_map_sgtable (attach->dev, sg, direction,0 );if (ret) -return ERR_PTR (ret); + goto err_free_table; }return sg; + +err_free_table: +sg_free_table (sg); +err_free_sg: +kfree (sg); +return ERR_PTR (ret); } static void amdxdna_ubuf_unmap(struct dma_buf_attachment *attach,