lkml.org 
[lkml]   [2022]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.18 112/159] media: rga: fix possible memory leak in rga_probe
    Date
    From: Hangyu Hua <hbh25y@gmail.com>

    [ Upstream commit a71eb6025305192e646040cd76ccacb5bd48a1b5 ]

    rga->m2m_dev needs to be freed when rga_probe fails.

    Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 3d3d1062e212..2f8df74ad0fd 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.35.1
    \
     
     \ /
      Last update: 2022-05-30 15:38    [W:4.086 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site