lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 746/757] drm/panfrost: perfcnt: fix ref count leak in panfrost_perfcnt_enable_locked
    Date
    From: Navid Emamdoost <navid.emamdoost@gmail.com>

    [ Upstream commit 9df0e0c1889677175037445d5ad1654d54176369 ]

    in panfrost_perfcnt_enable_locked, pm_runtime_get_sync is called which
    increments the counter even in case of failure, leading to incorrect
    ref count. In case of failure, decrement the ref count before returning.

    Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
    Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
    Signed-off-by: Rob Herring <robh@kernel.org>
    Link: https://patchwork.freedesktop.org/patch/msgid/20200614063619.44944-1-navid.emamdoost@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 10 +++++++---
    1 file changed, 7 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
    index ec4695cf3caf3..fdbc8d9491356 100644
    --- a/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
    +++ b/drivers/gpu/drm/panfrost/panfrost_perfcnt.c
    @@ -83,11 +83,13 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,

    ret = pm_runtime_get_sync(pfdev->dev);
    if (ret < 0)
    - return ret;
    + goto err_put_pm;

    bo = drm_gem_shmem_create(pfdev->ddev, perfcnt->bosize);
    - if (IS_ERR(bo))
    - return PTR_ERR(bo);
    + if (IS_ERR(bo)) {
    + ret = PTR_ERR(bo);
    + goto err_put_pm;
    + }

    /* Map the perfcnt buf in the address space attached to file_priv. */
    ret = panfrost_gem_open(&bo->base, file_priv);
    @@ -168,6 +170,8 @@ static int panfrost_perfcnt_enable_locked(struct panfrost_device *pfdev,
    panfrost_gem_close(&bo->base, file_priv);
    err_put_bo:
    drm_gem_object_put(&bo->base);
    +err_put_pm:
    + pm_runtime_put(pfdev->dev);
    return ret;
    }

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:40    [W:4.671 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site