From: Qinglang Miao <miaoqinglang@huawei.com>
To: Vignesh R <vigneshr@ti.com>, Aaro Koskinen <aaro.koskinen@iki.fi>,
"Tony Lindgren" <tony@atomide.com>
Cc: <linux-omap@vger.kernel.org>, <linux-i2c@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Qinglang Miao <miaoqinglang@huawei.com>
Subject: [PATCH 5/8] i2c: omap: fix reference leak when pm_runtime_get_sync fails
Date: Tue, 1 Dec 2020 17:31:43 +0800 [thread overview]
Message-ID: <20201201093143.113180-1-miaoqinglang@huawei.com> (raw)
In-Reply-To: <20201201092924.112461-1-miaoqinglang@huawei.com>
The PM reference count is not expected to be incremented on
return in omap_i2c_probe() and omap_i2c_remove().
However, pm_runtime_get_sync will increment the PM reference
count even failed. Forgetting to putting operation will result
in a reference leak here. I Replace it with pm_runtime_resume_and_get
to keep usage counter balanced.
What's more, error path 'err_free_mem' seems not like a proper
name any more. So I change the name to err_disable_pm and move
pm_runtime_disable below, for pm_runtime of 'pdev->dev' should
be disabled when pm_runtime_resume_and_get fails.
Fixes: 3b0fb97c8dc4 ("I2C: OMAP: Handle error check for pm runtime")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
---
drivers/i2c/busses/i2c-omap.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 12ac4212a..d4f6c6d60 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1404,9 +1404,9 @@ omap_i2c_probe(struct platform_device *pdev)
pm_runtime_set_autosuspend_delay(omap->dev, OMAP_I2C_PM_TIMEOUT);
pm_runtime_use_autosuspend(omap->dev);
- r = pm_runtime_get_sync(omap->dev);
+ r = pm_runtime_resume_and_get(omap->dev);
if (r < 0)
- goto err_free_mem;
+ goto err_disable_pm;
/*
* Read the Rev hi bit-[15:14] ie scheme this is 1 indicates ver2.
@@ -1513,8 +1513,8 @@ omap_i2c_probe(struct platform_device *pdev)
omap_i2c_write_reg(omap, OMAP_I2C_CON_REG, 0);
pm_runtime_dont_use_autosuspend(omap->dev);
pm_runtime_put_sync(omap->dev);
+err_disable_pm:
pm_runtime_disable(&pdev->dev);
-err_free_mem:
return r;
}
@@ -1525,7 +1525,7 @@ static int omap_i2c_remove(struct platform_device *pdev)
int ret;
i2c_del_adapter(&omap->adapter);
- ret = pm_runtime_get_sync(&pdev->dev);
+ ret = pm_runtime_resume_and_get(&pdev->dev);
if (ret < 0)
return ret;
--
2.23.0
next prev parent reply other threads:[~2020-12-01 9:25 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-01 9:29 [PATCH 0/8] i2c: fix reference leak when pm_runtime_get_sync fails Qinglang Miao
2020-12-01 9:31 ` [PATCH 1/8] i2c: cadence: " Qinglang Miao
2020-12-01 9:31 ` [PATCH 2/8] i2c: img-scb: " Qinglang Miao
2020-12-01 9:31 ` [PATCH 3/8] i2c: imx-lpi2c: " Qinglang Miao
2020-12-01 9:31 ` [PATCH 4/8] i2c: imx: " Qinglang Miao
2020-12-11 11:18 ` Oleksij Rempel
2020-12-01 9:31 ` Qinglang Miao [this message]
2020-12-01 16:53 ` [PATCH 5/8] i2c: omap: " Grygorii Strashko
2020-12-02 5:13 ` Vignesh Raghavendra
2020-12-01 9:31 ` [PATCH 6/8] i2c: sprd: " Qinglang Miao
2020-12-01 9:31 ` [PATCH 7/8] i2c: stm32f7: " Qinglang Miao
2020-12-01 9:31 ` [PATCH 8/8] i2c: xiic: " Qinglang Miao
2021-04-14 7:51 ` [PATCH 0/8] i2c: " Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201201093143.113180-1-miaoqinglang@huawei.com \
--to=miaoqinglang@huawei.com \
--cc=aaro.koskinen@iki.fi \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
--cc=vigneshr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).