| Message ID | 20201201093141.113135-1-miaoqinglang@huawei.com |
|---|---|
| State | Accepted |
| Commit | 47ff617217ca6a13194fcb35c6c3a0c57c080693 |
| Headers | show |
| Series | i2c: fix reference leak when pm_runtime_get_sync fails | expand |
On Tue, Dec 01, 2020 at 05:31:41PM +0800, Qinglang Miao wrote: > 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> Thank you! Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de> > --- > 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 c98529c76..93d2069da 100644 > --- a/drivers/i2c/busses/i2c-imx.c > +++ b/drivers/i2c/busses/i2c-imx.c > @@ -1008,7 +1008,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; > > @@ -1252,7 +1252,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.23.0 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index c98529c76..93d2069da 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -1008,7 +1008,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; @@ -1252,7 +1252,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;
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> --- drivers/i2c/busses/i2c-imx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)