[-next] i2c: imx-lpi2c: fix PM reference leak in lpi2c_imx_master_enable()

Message ID 20210408111930.203574-1-yeweihua4@huawei.com
State New
Headers show
Series
  • [-next] i2c: imx-lpi2c: fix PM reference leak in lpi2c_imx_master_enable()
Related show

Commit Message

Ye Weihua April 8, 2021, 11:19 a.m.
The PM reference count is not expected to be incremented on return in
ipi2c_imx_master_enable().

However, pm_runtime_get_sync() will increment the PM reference count
even on failure. forgetting to put the reference again will result in
a leak.

Replace it with pm_runtime_resume_and_get() to keep the usage counter
balanced.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Ye Weihua <yeweihua4@huawei.com>
---
 drivers/i2c/busses/i2c-imx-lpi2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Wolfram Sang April 14, 2021, 7:56 a.m. | #1
On Thu, Apr 08, 2021 at 07:19:30PM +0800, Ye Weihua wrote:
> The PM reference count is not expected to be incremented on return in

> ipi2c_imx_master_enable().

> 

> However, pm_runtime_get_sync() will increment the PM reference count

> even on failure. forgetting to put the reference again will result in

> a leak.

> 

> Replace it with pm_runtime_resume_and_get() to keep the usage counter

> balanced.

> 

> Reported-by: Hulk Robot <hulkci@huawei.com>

> Signed-off-by: Ye Weihua <yeweihua4@huawei.com>


Thanks, yet I applied this series now:

http://patchwork.ozlabs.org/project/linux-i2c/list/?series=217733&state=*

Patch

diff --git a/drivers/i2c/busses/i2c-imx-lpi2c.c b/drivers/i2c/busses/i2c-imx-lpi2c.c
index 9db6ccded5e9..8b9ba055c418 100644
--- a/drivers/i2c/busses/i2c-imx-lpi2c.c
+++ b/drivers/i2c/busses/i2c-imx-lpi2c.c
@@ -259,7 +259,7 @@  static int lpi2c_imx_master_enable(struct lpi2c_imx_struct *lpi2c_imx)
 	unsigned int temp;
 	int ret;
 
-	ret = pm_runtime_get_sync(lpi2c_imx->adapter.dev.parent);
+	ret = pm_runtime_resume_and_get(lpi2c_imx->adapter.dev.parent);
 	if (ret < 0)
 		return ret;