[v2] accel/amdxdna: Fix memory leak in amdxdna_ubuf_map

[PATCH v2] accel/amdxdna: Fix memory leak in amdxdna_ubuf_map

Posted by zishun yi 1 week, 1 day ago

From: Zishun Yi <zishun.yi.dev@gmail.com>

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.

Fixes: bd72d4acda10 ("accel/amdxdna: Support user space allocated buffer")
Signed-off-by: Zishun Yi <zishun.yi.dev@gmail.com>
---
v2: Add 'Fixes' tag

 drivers/accel/amdxdna/amdxdna_ubuf.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/accel/amdxdna/amdxdna_ubuf.c b/drivers/accel/amdxdna/amdxdna_ubuf.c
index 077b2261cf2a..9e3b3b055caa 100644
--- a/drivers/accel/amdxdna/amdxdna_ubuf.c
+++ b/drivers/accel/amdxdna/amdxdna_ubuf.c
@@ -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,
-- 
2.51.2

Re: [PATCH v2] accel/amdxdna: Fix memory leak in amdxdna_ubuf_map

Posted by Lizhi Hou 1 week ago

Applied to drm-misc-next-fixes.

On 1/29/26 09:10, zishun yi wrote:
> From: Zishun Yi <zishun.yi.dev@gmail.com>
>
> 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.
>
> Fixes: bd72d4acda10 ("accel/amdxdna: Support user space allocated buffer")
> Signed-off-by: Zishun Yi <zishun.yi.dev@gmail.com>
> ---
> v2: Add 'Fixes' tag
>
>   drivers/accel/amdxdna/amdxdna_ubuf.c | 10 ++++++++--
>   1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/accel/amdxdna/amdxdna_ubuf.c b/drivers/accel/amdxdna/amdxdna_ubuf.c
> index 077b2261cf2a..9e3b3b055caa 100644
> --- a/drivers/accel/amdxdna/amdxdna_ubuf.c
> +++ b/drivers/accel/amdxdna/amdxdna_ubuf.c
> @@ -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,

Re: [PATCH v2] accel/amdxdna: Fix memory leak in amdxdna_ubuf_map

Posted by Min Ma 1 week, 1 day ago

Looks good.

Reviewed-by: Min Ma <mamin506@gmail.com>

Re: [PATCH v2] accel/amdxdna: Fix memory leak in amdxdna_ubuf_map

Posted by Lizhi Hou 1 week, 1 day ago

Reviewed-by: Lizhi Hou <lizhi.hou@amd.com>

On 1/29/26 09:10, zishun yi wrote:
> From: Zishun Yi <zishun.yi.dev@gmail.com>
>
> 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.
>
> Fixes: bd72d4acda10 ("accel/amdxdna: Support user space allocated buffer")
> Signed-off-by: Zishun Yi <zishun.yi.dev@gmail.com>
> ---
> v2: Add 'Fixes' tag
>
>   drivers/accel/amdxdna/amdxdna_ubuf.c | 10 ++++++++--
>   1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/accel/amdxdna/amdxdna_ubuf.c b/drivers/accel/amdxdna/amdxdna_ubuf.c
> index 077b2261cf2a..9e3b3b055caa 100644
> --- a/drivers/accel/amdxdna/amdxdna_ubuf.c
> +++ b/drivers/accel/amdxdna/amdxdna_ubuf.c
> @@ -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,