lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 127/717] media: cedrus: fix reference leak in cedrus_start_streaming
    Date
    From: Zhang Qilong <zhangqilong3@huawei.com>

    [ Upstream commit 940727bf22f74cbdef8de327de34c4ae565c89ea ]

    pm_runtime_get_sync will increment pm usage counter even it
    failed. Forgetting to pm_runtime_put_noidle will result in
    reference leak in cedrus_start_streaming. We should fix it.

    Fixes: d5aecd289babf ("media: cedrus: Implement runtime PM")
    Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/media/sunxi/cedrus/cedrus_video.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_video.c b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
    index 667b86dde1ee8..911f607d9b092 100644
    --- a/drivers/staging/media/sunxi/cedrus/cedrus_video.c
    +++ b/drivers/staging/media/sunxi/cedrus/cedrus_video.c
    @@ -479,8 +479,10 @@ static int cedrus_start_streaming(struct vb2_queue *vq, unsigned int count)

    if (V4L2_TYPE_IS_OUTPUT(vq->type)) {
    ret = pm_runtime_get_sync(dev->dev);
    - if (ret < 0)
    + if (ret < 0) {
    + pm_runtime_put_noidle(dev->dev);
    goto err_cleanup;
    + }

    if (dev->dec_ops[ctx->current_codec]->start) {
    ret = dev->dec_ops[ctx->current_codec]->start(ctx);
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:10    [W:3.839 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site