The Linux Kernel Mailing List
 help / color / mirror / Atom feed
* [PATCH] drm: tegra: fix memory leak in error handling path
@ 2022-03-29 10:37 cgel.zte
  2022-03-29 10:55 ` Jon Hunter
  0 siblings, 1 reply; 2+ messages in thread
From: cgel.zte @ 2022-03-29 10:37 UTC (permalink / raw)
  To: thierry.reding
  Cc: airlied, daniel, jonathanh, dri-devel, linux-tegra, linux-kernel,
	Lv Ruyi, Zeal Robot

From: Lv Ruyi <lv.ruyi@zte.com.cn>

Before leave the nvdec_load_firmware, we shuold free virt which is alloced
by dma_alloc_coherent, so change "return err" to "goto cleanup".

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Lv Ruyi <lv.ruyi@zte.com.cn>
---
 drivers/gpu/drm/tegra/nvdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/tegra/nvdec.c b/drivers/gpu/drm/tegra/nvdec.c
index 79e1e88203cf..a14863346bfa 100644
--- a/drivers/gpu/drm/tegra/nvdec.c
+++ b/drivers/gpu/drm/tegra/nvdec.c
@@ -209,7 +209,7 @@ static int nvdec_load_firmware(struct nvdec *nvdec)
 
 		err = dma_mapping_error(nvdec->dev, iova);
 		if (err < 0)
-			return err;
+			goto cleanup;
 	} else {
 		virt = tegra_drm_alloc(tegra, size, &iova);
 	}
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] drm: tegra: fix memory leak in error handling path
  2022-03-29 10:37 [PATCH] drm: tegra: fix memory leak in error handling path cgel.zte
@ 2022-03-29 10:55 ` Jon Hunter
  0 siblings, 0 replies; 2+ messages in thread
From: Jon Hunter @ 2022-03-29 10:55 UTC (permalink / raw)
  To: cgel.zte, thierry.reding
  Cc: airlied, daniel, dri-devel, linux-tegra, linux-kernel, Lv Ruyi,
	Zeal Robot


On 29/03/2022 11:37, cgel.zte@gmail.com wrote:
> From: Lv Ruyi <lv.ruyi@zte.com.cn>
> 
> Before leave the nvdec_load_firmware, we shuold free virt which is alloced

s/shuold/should
s/alloced/allocated

> by dma_alloc_coherent, so change "return err" to "goto cleanup".
> 
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Lv Ruyi <lv.ruyi@zte.com.cn>
> ---
>   drivers/gpu/drm/tegra/nvdec.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/tegra/nvdec.c b/drivers/gpu/drm/tegra/nvdec.c
> index 79e1e88203cf..a14863346bfa 100644
> --- a/drivers/gpu/drm/tegra/nvdec.c
> +++ b/drivers/gpu/drm/tegra/nvdec.c
> @@ -209,7 +209,7 @@ static int nvdec_load_firmware(struct nvdec *nvdec)
>   
>   		err = dma_mapping_error(nvdec->dev, iova);
>   		if (err < 0)
> -			return err;
> +			goto cleanup;


Actually, I think that the correct fix here would be the same as what 
was done for VIC ...

https://lore.kernel.org/linux-mm/6b86f6e530b504a5eee864af10e2ae1570d7b645.1639157090.git.robin.murphy@arm.com/

Jon

-- 
nvpublic

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-03-29 10:56 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-29 10:37 [PATCH] drm: tegra: fix memory leak in error handling path cgel.zte
2022-03-29 10:55 ` Jon Hunter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox