* [PATCH] media: rga: fix possible memory leak in rga_probe
@ 2022-03-24 8:37 Hangyu Hua
2022-04-08 2:18 ` Hangyu Hua
0 siblings, 1 reply; 2+ messages in thread
From: Hangyu Hua @ 2022-03-24 8:37 UTC (permalink / raw)
To: jacob-chen, ezequiel, mchehab, heiko
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel, Hangyu Hua
rga->m2m_dev needs to be freed when rga_probe fails.
Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
---
drivers/media/platform/rockchip/rga/rga.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
index 4de5e8d2b261..c2ce4fdcdb7f 100644
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -865,7 +865,7 @@ static int rga_probe(struct platform_device *pdev)
ret = pm_runtime_resume_and_get(rga->dev);
if (ret < 0)
- goto rel_vdev;
+ goto rel_m2m;
rga->version.major = (rga_read(rga, RGA_VERSION_INFO) >> 24) & 0xFF;
rga->version.minor = (rga_read(rga, RGA_VERSION_INFO) >> 20) & 0x0F;
@@ -881,7 +881,7 @@ static int rga_probe(struct platform_device *pdev)
DMA_ATTR_WRITE_COMBINE);
if (!rga->cmdbuf_virt) {
ret = -ENOMEM;
- goto rel_vdev;
+ goto rel_m2m;
}
rga->src_mmu_pages =
@@ -918,6 +918,8 @@ static int rga_probe(struct platform_device *pdev)
free_dma:
dma_free_attrs(rga->dev, RGA_CMDBUF_SIZE, rga->cmdbuf_virt,
rga->cmdbuf_phy, DMA_ATTR_WRITE_COMBINE);
+rel_m2m:
+ v4l2_m2m_release(rga->m2m_dev);
rel_vdev:
video_device_release(vfd);
unreg_v4l2_dev:
--
2.25.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] media: rga: fix possible memory leak in rga_probe
2022-03-24 8:37 [PATCH] media: rga: fix possible memory leak in rga_probe Hangyu Hua
@ 2022-04-08 2:18 ` Hangyu Hua
0 siblings, 0 replies; 2+ messages in thread
From: Hangyu Hua @ 2022-04-08 2:18 UTC (permalink / raw)
To: jacob-chen, ezequiel, mchehab, heiko
Cc: linux-media, linux-rockchip, linux-arm-kernel, linux-kernel
Gentle ping.
On 2022/3/24 16:37, Hangyu Hua wrote:
> rga->m2m_dev needs to be freed when rga_probe fails.
>
> Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
> ---
> drivers/media/platform/rockchip/rga/rga.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
> index 4de5e8d2b261..c2ce4fdcdb7f 100644
> --- a/drivers/media/platform/rockchip/rga/rga.c
> +++ b/drivers/media/platform/rockchip/rga/rga.c
> @@ -865,7 +865,7 @@ static int rga_probe(struct platform_device *pdev)
>
> ret = pm_runtime_resume_and_get(rga->dev);
> if (ret < 0)
> - goto rel_vdev;
> + goto rel_m2m;
>
> rga->version.major = (rga_read(rga, RGA_VERSION_INFO) >> 24) & 0xFF;
> rga->version.minor = (rga_read(rga, RGA_VERSION_INFO) >> 20) & 0x0F;
> @@ -881,7 +881,7 @@ static int rga_probe(struct platform_device *pdev)
> DMA_ATTR_WRITE_COMBINE);
> if (!rga->cmdbuf_virt) {
> ret = -ENOMEM;
> - goto rel_vdev;
> + goto rel_m2m;
> }
>
> rga->src_mmu_pages =
> @@ -918,6 +918,8 @@ static int rga_probe(struct platform_device *pdev)
> free_dma:
> dma_free_attrs(rga->dev, RGA_CMDBUF_SIZE, rga->cmdbuf_virt,
> rga->cmdbuf_phy, DMA_ATTR_WRITE_COMBINE);
> +rel_m2m:
> + v4l2_m2m_release(rga->m2m_dev);
> rel_vdev:
> video_device_release(vfd);
> unreg_v4l2_dev:
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-04-08 2:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-24 8:37 [PATCH] media: rga: fix possible memory leak in rga_probe Hangyu Hua
2022-04-08 2:18 ` Hangyu Hua
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®