From: Qinglang Miao miaoqinglang@huawei.com

mainline inclusion from mainline-v5.13-rc1 commit 3a4f326463117cee3adcb72999ca34a9aaafda93 category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I956UO CVE: CVE-2020-36780

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=...

--------------------------------

[ Upstream commit 3a4f326463117cee3adcb72999ca34a9aaafda93 ]

The PM reference count is not expected to be incremented on return in sprd_i2c_master_xfer() and sprd_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: 8b9ec0719834 ("i2c: Add Spreadtrum I2C controller driver") Reported-by: Hulk Robot hulkci@huawei.com Signed-off-by: Qinglang Miao miaoqinglang@huawei.com Signed-off-by: Wolfram Sang wsa@kernel.org Signed-off-by: Sasha Levin sashal@kernel.org

conflict: drivers/i2c/busses/i2c-sprd.c

Signed-off-by: Liao Chen liaochen4@huawei.com --- drivers/i2c/busses/i2c-sprd.c | 4 ++-- drivers/i2c/busses/i2c-sprd.c.rej | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 drivers/i2c/busses/i2c-sprd.c.rej

diff --git a/drivers/i2c/busses/i2c-sprd.c b/drivers/i2c/busses/i2c-sprd.c index a94e724f51dc..2f82ec2c8ce5 100644 --- a/drivers/i2c/busses/i2c-sprd.c +++ b/drivers/i2c/busses/i2c-sprd.c @@ -287,7 +287,7 @@ static int sprd_i2c_master_xfer(struct i2c_adapter *i2c_adap, if (i2c_dev->is_suspended) return -EBUSY;

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

@@ -573,7 +573,7 @@ static int sprd_i2c_remove(struct platform_device *pdev) struct sprd_i2c *i2c_dev = platform_get_drvdata(pdev); int ret;

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

diff --git a/drivers/i2c/busses/i2c-sprd.c.rej b/drivers/i2c/busses/i2c-sprd.c.rej new file mode 100644 index 000000000000..05c7b4861b46 --- /dev/null +++ b/drivers/i2c/busses/i2c-sprd.c.rej @@ -0,0 +1,10 @@ +diff a/drivers/i2c/busses/i2c-sprd.c b/drivers/i2c/busses/i2c-sprd.c (rejected hunks) +@@ -283,7 +283,7 @@ static int sprd_i2c_master_xfer(struct i2c_adapter *i2c_adap, + struct sprd_i2c *i2c_dev = i2c_adap->algo_data; + int im, ret; + +- ret = pm_runtime_get_sync(i2c_dev->dev); ++ ret = pm_runtime_resume_and_get(i2c_dev->dev); + if (ret < 0) + return ret; +