| Message ID | 20201106015357.141235-1-zhangqilong3@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 88e1419b5ee30cc50e0c4d5265bdee1ba04af539 |
| Headers | show |
| Series | spi: stm32-qspi: fix reference leak in stm32 qspi operations | expand |
Hi Zhang On 11/6/20 2:53 AM, Zhang Qilong wrote: > pm_runtime_get_sync will increment pm usage counter even it > failed. Forgetting to pm_runtime_put_noidle will result in > reference leak in two callers(stm32_qspi_exec_op and > stm32_qspi_setup), so we should fix it. > > Fixes: 9d282c17b023a ("spi: stm32-qspi: Add pm_runtime support") > Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> > --- > drivers/spi/spi-stm32-qspi.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c > index a900962b4336..947e6b9dc9f4 100644 > --- a/drivers/spi/spi-stm32-qspi.c > +++ b/drivers/spi/spi-stm32-qspi.c > @@ -434,8 +434,10 @@ static int stm32_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) > int ret; > > ret = pm_runtime_get_sync(qspi->dev); > - if (ret < 0) > + if (ret < 0) { > + pm_runtime_put_noidle(qspi->dev); > return ret; > + } > > mutex_lock(&qspi->lock); > ret = stm32_qspi_send(mem, op); > @@ -462,8 +464,10 @@ static int stm32_qspi_setup(struct spi_device *spi) > return -EINVAL; > > ret = pm_runtime_get_sync(qspi->dev); > - if (ret < 0) > + if (ret < 0) { > + pm_runtime_put_noidle(qspi->dev); > return ret; > + } > > presc = DIV_ROUND_UP(qspi->clk_rate, spi->max_speed_hz) - 1; > Reviewed-by: Patrice Chotard <patrice.chotard@st.com> Thanks
On Fri, 6 Nov 2020 09:53:57 +0800, Zhang Qilong wrote: > pm_runtime_get_sync will increment pm usage counter even it > failed. Forgetting to pm_runtime_put_noidle will result in > reference leak in two callers(stm32_qspi_exec_op and > stm32_qspi_setup), so we should fix it. Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: stm32-qspi: fix reference leak in stm32 qspi operations commit: 88e1419b5ee30cc50e0c4d5265bdee1ba04af539 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c index a900962b4336..947e6b9dc9f4 100644 --- a/drivers/spi/spi-stm32-qspi.c +++ b/drivers/spi/spi-stm32-qspi.c @@ -434,8 +434,10 @@ static int stm32_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) int ret; ret = pm_runtime_get_sync(qspi->dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put_noidle(qspi->dev); return ret; + } mutex_lock(&qspi->lock); ret = stm32_qspi_send(mem, op); @@ -462,8 +464,10 @@ static int stm32_qspi_setup(struct spi_device *spi) return -EINVAL; ret = pm_runtime_get_sync(qspi->dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put_noidle(qspi->dev); return ret; + } presc = DIV_ROUND_UP(qspi->clk_rate, spi->max_speed_hz) - 1;
pm_runtime_get_sync will increment pm usage counter even it failed. Forgetting to pm_runtime_put_noidle will result in reference leak in two callers(stm32_qspi_exec_op and stm32_qspi_setup), so we should fix it. Fixes: 9d282c17b023a ("spi: stm32-qspi: Add pm_runtime support") Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> --- drivers/spi/spi-stm32-qspi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)