lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 116/563] media: venus: core: Fix a resource leak in the error handling path of venus_probe()
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit 8cc7a1b2aca067397a016cdb971a5e6ad9b640c7 ]

    A successful 'of_platform_populate()' call should be balanced by a
    corresponding 'of_platform_depopulate()' call in the error handling path
    of the probe, as already done in the remove function.

    A successful 'venus_firmware_init()' call should be balanced by a
    corresponding 'venus_firmware_deinit()' call in the error handling path
    of the probe, as already done in the remove function.

    Update the error handling path accordingly.

    Fixes: f9799fcce4bb ("media: venus: firmware: register separate platform_device for firmware loader")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/qcom/venus/core.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
    index 791ed1b1bbbd3..1d621f7769035 100644
    --- a/drivers/media/platform/qcom/venus/core.c
    +++ b/drivers/media/platform/qcom/venus/core.c
    @@ -294,11 +294,11 @@ static int venus_probe(struct platform_device *pdev)

    ret = venus_firmware_init(core);
    if (ret)
    - goto err_runtime_disable;
    + goto err_of_depopulate;

    ret = venus_boot(core);
    if (ret)
    - goto err_runtime_disable;
    + goto err_firmware_deinit;

    ret = hfi_core_resume(core, true);
    if (ret)
    @@ -330,6 +330,10 @@ err_dev_unregister:
    v4l2_device_unregister(&core->v4l2_dev);
    err_venus_shutdown:
    venus_shutdown(core);
    +err_firmware_deinit:
    + venus_firmware_deinit(core);
    +err_of_depopulate:
    + of_platform_depopulate(dev);
    err_runtime_disable:
    pm_runtime_put_noidle(dev);
    pm_runtime_set_suspended(dev);
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 22:40    [W:2.284 / U:0.360 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site