From: Qinglang Miao <miaoqinglang@huawei.com>
To: Michal Simek <michal.simek@xilinx.com>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-i2c@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Qinglang Miao <miaoqinglang@huawei.com>
Subject: [PATCH 8/8] i2c: xiic: fix reference leak when pm_runtime_get_sync fails
Date: Tue, 1 Dec 2020 17:31:46 +0800 [thread overview]
Message-ID: <20201201093146.113316-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 xiic_xfer and xiic_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.
Replace it with pm_runtime_resume_and_get to keep usage
counter balanced.
Fixes: 10b17004a74c ("i2c: xiic: Fix the clocking across bind unbind")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
---
drivers/i2c/busses/i2c-xiic.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index 087b29519..2a8568b97 100644
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -706,7 +706,7 @@ static int xiic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
dev_dbg(adap->dev.parent, "%s entry SR: 0x%x\n", __func__,
xiic_getreg8(i2c, XIIC_SR_REG_OFFSET));
- err = pm_runtime_get_sync(i2c->dev);
+ err = pm_runtime_resume_and_get(i2c->dev);
if (err < 0)
return err;
@@ -873,7 +873,7 @@ static int xiic_i2c_remove(struct platform_device *pdev)
/* remove adapter & data */
i2c_del_adapter(&i2c->adap);
- ret = pm_runtime_get_sync(i2c->dev);
+ ret = pm_runtime_resume_and_get(i2c->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 ` [PATCH 5/8] i2c: omap: " Qinglang Miao
2020-12-01 16:53 ` 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 ` Qinglang Miao [this message]
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=20201201093146.113316-1-miaoqinglang@huawei.com \
--to=miaoqinglang@huawei.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@xilinx.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).