* [PATCH] drivers/mmc: fix reference count leaks in moxart_probe
@ 2021-09-16 18:18 Xin Xiong
2021-09-23 18:12 ` Ulf Hansson
0 siblings, 1 reply; 2+ messages in thread
From: Xin Xiong @ 2021-09-16 18:18 UTC (permalink / raw)
To: Ulf Hansson, linux-mmc, linux-kernel
Cc: yuanxzhang, Xin Xiong, Xiyu Yang, Xin Tan
The issue happens in several error handling paths on two refcounted
object related to the object "host" (dma_chan_rx, dma_chan_tx). In
these paths, the function forgets to decrement the reference count of
one or both objects' reference count increased earlier by
dma_request_chan(), causing reference count leaks.
Fix it by decreasing reference counts of both objects in each path
separately.
Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
---
drivers/mmc/host/moxart-mmc.c | 38 ++++++++++++++++++++++++++---------
1 file changed, 28 insertions(+), 10 deletions(-)
diff --git a/drivers/mmc/host/moxart-mmc.c b/drivers/mmc/host/moxart-mmc.c
index 6c9d38132..b5aa1010c 100644
--- a/drivers/mmc/host/moxart-mmc.c
+++ b/drivers/mmc/host/moxart-mmc.c
@@ -606,7 +606,28 @@ static int moxart_probe(struct platform_device *pdev)
host->sysclk = clk_get_rate(clk);
host->fifo_width = readl(host->base + REG_FEATURE) << 2;
host->dma_chan_tx = dma_request_chan(dev, "tx");
+ if (IS_ERR(host->dma_chan_tx)) {
+ if (PTR_ERR(host->dma_chan_tx) == -EPROBE_DEFER) {
+ ret = -EPROBE_DEFER;
+ goto out;
+ }
+ }
+
host->dma_chan_rx = dma_request_chan(dev, "rx");
+ if (IS_ERR(host->dma_chan_rx)) {
+ if (!IS_ERR(host->dma_chan_tx))
+ dma_release_channel(host->dma_chan_tx);
+ if (PTR_ERR(host->dma_chan_rx) == -EPROBE_DEFER) {
+ ret = -EPROBE_DEFER;
+ goto out;
+ }
+ dev_dbg(dev, "PIO mode transfer enabled\n");
+ host->have_dma = false;
+ } else if (IS_ERR(host->dma_chan_tx)) {
+ dma_release_channel(host->chan_rx);
+ dev_dbg(dev, "PIO mode transfer enabled\n");
+ host->have_dma = false;
+ }
spin_lock_init(&host->lock);
@@ -615,15 +636,7 @@ static int moxart_probe(struct platform_device *pdev)
mmc->f_min = DIV_ROUND_CLOSEST(host->sysclk, CLK_DIV_MASK * 2);
mmc->ocr_avail = 0xffff00; /* Support 2.0v - 3.6v power. */
- if (IS_ERR(host->dma_chan_tx) || IS_ERR(host->dma_chan_rx)) {
- if (PTR_ERR(host->dma_chan_tx) == -EPROBE_DEFER ||
- PTR_ERR(host->dma_chan_rx) == -EPROBE_DEFER) {
- ret = -EPROBE_DEFER;
- goto out;
- }
- dev_dbg(dev, "PIO mode transfer enabled\n");
- host->have_dma = false;
- } else {
+ if (!IS_ERR(host->dma_chan_tx) && !IS_ERR(host->dma_chan_rx)) {
dev_dbg(dev, "DMA channels found (%p,%p)\n",
host->dma_chan_tx, host->dma_chan_rx);
host->have_dma = true;
@@ -664,8 +677,13 @@ static int moxart_probe(struct platform_device *pdev)
}
ret = devm_request_irq(dev, irq, moxart_irq, 0, "moxart-mmc", host);
- if (ret)
+ if (ret) {
+ if (host->have_dma) {
+ dma_release_channel(host->dma_chan_tx);
+ dma_release_channel(host->dma_chan_rx);
+ }
goto out;
+ }
dev_set_drvdata(dev, mmc);
mmc_add_host(mmc);
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drivers/mmc: fix reference count leaks in moxart_probe
2021-09-16 18:18 [PATCH] drivers/mmc: fix reference count leaks in moxart_probe Xin Xiong
@ 2021-09-23 18:12 ` Ulf Hansson
0 siblings, 0 replies; 2+ messages in thread
From: Ulf Hansson @ 2021-09-23 18:12 UTC (permalink / raw)
To: Xin Xiong
Cc: linux-mmc, Linux Kernel Mailing List, yuanxzhang, Xiyu Yang, Xin Tan
On Thu, 16 Sept 2021 at 20:19, Xin Xiong <xiongx18@fudan.edu.cn> wrote:
>
> The issue happens in several error handling paths on two refcounted
> object related to the object "host" (dma_chan_rx, dma_chan_tx). In
> these paths, the function forgets to decrement the reference count of
> one or both objects' reference count increased earlier by
> dma_request_chan(), causing reference count leaks.
>
> Fix it by decreasing reference counts of both objects in each path
> separately.
>
> Signed-off-by: Xin Xiong <xiongx18@fudan.edu.cn>
> Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
> Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
> ---
> drivers/mmc/host/moxart-mmc.c | 38 ++++++++++++++++++++++++++---------
> 1 file changed, 28 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/mmc/host/moxart-mmc.c b/drivers/mmc/host/moxart-mmc.c
> index 6c9d38132..b5aa1010c 100644
> --- a/drivers/mmc/host/moxart-mmc.c
> +++ b/drivers/mmc/host/moxart-mmc.c
> @@ -606,7 +606,28 @@ static int moxart_probe(struct platform_device *pdev)
> host->sysclk = clk_get_rate(clk);
> host->fifo_width = readl(host->base + REG_FEATURE) << 2;
> host->dma_chan_tx = dma_request_chan(dev, "tx");
> + if (IS_ERR(host->dma_chan_tx)) {
> + if (PTR_ERR(host->dma_chan_tx) == -EPROBE_DEFER) {
> + ret = -EPROBE_DEFER;
> + goto out;
> + }
> + }
> +
> host->dma_chan_rx = dma_request_chan(dev, "rx");
> + if (IS_ERR(host->dma_chan_rx)) {
> + if (!IS_ERR(host->dma_chan_tx))
> + dma_release_channel(host->dma_chan_tx);
> + if (PTR_ERR(host->dma_chan_rx) == -EPROBE_DEFER) {
> + ret = -EPROBE_DEFER;
> + goto out;
> + }
> + dev_dbg(dev, "PIO mode transfer enabled\n");
> + host->have_dma = false;
> + } else if (IS_ERR(host->dma_chan_tx)) {
> + dma_release_channel(host->chan_rx);
> + dev_dbg(dev, "PIO mode transfer enabled\n");
> + host->have_dma = false;
> + }
>
> spin_lock_init(&host->lock);
>
> @@ -615,15 +636,7 @@ static int moxart_probe(struct platform_device *pdev)
> mmc->f_min = DIV_ROUND_CLOSEST(host->sysclk, CLK_DIV_MASK * 2);
> mmc->ocr_avail = 0xffff00; /* Support 2.0v - 3.6v power. */
>
> - if (IS_ERR(host->dma_chan_tx) || IS_ERR(host->dma_chan_rx)) {
> - if (PTR_ERR(host->dma_chan_tx) == -EPROBE_DEFER ||
> - PTR_ERR(host->dma_chan_rx) == -EPROBE_DEFER) {
> - ret = -EPROBE_DEFER;
> - goto out;
> - }
> - dev_dbg(dev, "PIO mode transfer enabled\n");
> - host->have_dma = false;
> - } else {
> + if (!IS_ERR(host->dma_chan_tx) && !IS_ERR(host->dma_chan_rx)) {
> dev_dbg(dev, "DMA channels found (%p,%p)\n",
> host->dma_chan_tx, host->dma_chan_rx);
> host->have_dma = true;
> @@ -664,8 +677,13 @@ static int moxart_probe(struct platform_device *pdev)
> }
>
> ret = devm_request_irq(dev, irq, moxart_irq, 0, "moxart-mmc", host);
> - if (ret)
> + if (ret) {
> + if (host->have_dma) {
> + dma_release_channel(host->dma_chan_tx);
> + dma_release_channel(host->dma_chan_rx);
> + }
> goto out;
> + }
You are right, that we should call dma_release_channel in some error
paths. Although, the above looks rather messy to me. May I suggest
that we add the error handling below the "out" label instead. Along
the lines of this:
if (!IS_ERR(host->dma_chan_tx))
dma_release_channel(host->dma_chan_tx);
if (!IS_ERR(host->dma_chan_rx))
dma_release_channel(host->dma_chan_rx);
>
> dev_set_drvdata(dev, mmc);
> mmc_add_host(mmc);
> --
> 2.25.1
>
Kind regards
Uffe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-09-23 18:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-16 18:18 [PATCH] drivers/mmc: fix reference count leaks in moxart_probe Xin Xiong
2021-09-23 18:12 ` Ulf Hansson
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).