lkml.org 
[lkml]   [2021]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 431/530] i2c: imx: fix reference leak when pm_runtime_get_sync fails
    Date
    From: Qinglang Miao <miaoqinglang@huawei.com>

    [ Upstream commit 47ff617217ca6a13194fcb35c6c3a0c57c080693 ]

    In i2c_imx_xfer() and i2c_imx_remove(), the pm reference count
    is not expected to be incremented on return.

    However, pm_runtime_get_sync will increment pm reference count
    even failed. Forgetting to putting operation will result in a
    reference leak here.

    Replace it with pm_runtime_resume_and_get to keep usage
    counter balanced.

    Fixes: 3a5ee18d2a32 ("i2c: imx: implement master_xfer_atomic callback")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
    Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
    Signed-off-by: Wolfram Sang <wsa@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/i2c/busses/i2c-imx.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
    index e6f8d6e45a15..72af4b4d1318 100644
    --- a/drivers/i2c/busses/i2c-imx.c
    +++ b/drivers/i2c/busses/i2c-imx.c
    @@ -1036,7 +1036,7 @@ static int i2c_imx_xfer(struct i2c_adapter *adapter,
    struct imx_i2c_struct *i2c_imx = i2c_get_adapdata(adapter);
    int result;

    - result = pm_runtime_get_sync(i2c_imx->adapter.dev.parent);
    + result = pm_runtime_resume_and_get(i2c_imx->adapter.dev.parent);
    if (result < 0)
    return result;

    @@ -1280,7 +1280,7 @@ static int i2c_imx_remove(struct platform_device *pdev)
    struct imx_i2c_struct *i2c_imx = platform_get_drvdata(pdev);
    int irq, ret;

    - ret = pm_runtime_get_sync(&pdev->dev);
    + ret = pm_runtime_resume_and_get(&pdev->dev);
    if (ret < 0)
    return ret;

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-12 19:01    [W:4.297 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site