2022-06-05 10:34:55

by Miaoqian Lin

Subject: [PATCH v3 2/2] dmaengine: ti: Add missing put_device in ti_dra7_xbar_route_allocate

of_find_device_by_node() takes reference, we should use put_device()
to release it when not need anymore.

Fixes: a074ae38f859 ("dmaengine: Add driver for TI DMA crossbar on DRA7x")
Signed-off-by: Miaoqian Lin <[email protected]>
---
changes in v3:
- rebase so it can apply with the other patch
changes in v2:
- split v1 into two patches.
v1 link:
https://lore.kernel.org/r/[email protected]
v2 link:
https://lore.kernel.org/r/[email protected]/
---
drivers/dma/ti/dma-crossbar.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/dma/ti/dma-crossbar.c b/drivers/dma/ti/dma-crossbar.c
index e34cfb50d241..f744ddbbbad7 100644
--- a/drivers/dma/ti/dma-crossbar.c
+++ b/drivers/dma/ti/dma-crossbar.c
@@ -245,6 +245,7 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec,
if (dma_spec->args[0] >= xbar->xbar_requests) {
dev_err(&pdev->dev, "Invalid XBAR request number: %d\n",
dma_spec->args[0]);
+ put_device(&pdev->dev);
return ERR_PTR(-EINVAL);
}

@@ -252,12 +253,14 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec,
dma_spec->np = of_parse_phandle(ofdma->of_node, "dma-masters", 0);
if (!dma_spec->np) {
dev_err(&pdev->dev, "Can't get DMA master\n");
+ put_device(&pdev->dev);
return ERR_PTR(-EINVAL);
}

map = kzalloc(sizeof(*map), GFP_KERNEL);
if (!map) {
of_node_put(dma_spec->np);
+ put_device(&pdev->dev);
return ERR_PTR(-ENOMEM);
}

@@ -269,6 +272,7 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec,
dev_err(&pdev->dev, "Run out of free DMA requests\n");
kfree(map);
of_node_put(dma_spec->np);
+ put_device(&pdev->dev);
return ERR_PTR(-ENOMEM);
}
set_bit(map->xbar_out, xbar->dma_inuse);
--
2.25.1

2022-06-06 05:38:08

by Miaoqian Lin

Subject: [PATCH v3 1/2] dmaengine: ti: Fix refcount leak in ti_dra7_xbar_route_allocate

of_parse_phandle() returns a node pointer with refcount
incremented, we should use of_node_put() on it when not needed anymore.

Add missing of_node_put() in to fix this.

Fixes: ec9bfa1e1a79 ("dmaengine: ti-dma-crossbar: dra7: Use bitops instead of idr")
Signed-off-by: Miaoqian Lin <[email protected]>
---
v3 has no changes, just assemble two patches into a series so I keep
version consistent.

changes in v2:
- split v1 into two patches.
v1 link: https://lore.kernel.org/r/[email protected]
v2 link: https://lore.kernel.org/r/[email protected]
---
drivers/dma/ti/dma-crossbar.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/dma/ti/dma-crossbar.c b/drivers/dma/ti/dma-crossbar.c
index 71d24fc07c00..e34cfb50d241 100644
--- a/drivers/dma/ti/dma-crossbar.c
+++ b/drivers/dma/ti/dma-crossbar.c
@@ -268,6 +268,7 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec,
mutex_unlock(&xbar->mutex);
dev_err(&pdev->dev, "Run out of free DMA requests\n");
kfree(map);
+ of_node_put(dma_spec->np);
return ERR_PTR(-ENOMEM);
}
set_bit(map->xbar_out, xbar->dma_inuse);
--
2.25.1

2022-06-08 20:09:39

by Péter Ujfalusi

Subject: Re: [PATCH v3 2/2] dmaengine: ti: Add missing put_device in ti_dra7_xbar_route_allocate

On 05/06/2022 07:27, Miaoqian Lin wrote:
> of_find_device_by_node() takes reference, we should use put_device()
> to release it when not need anymore.

Thank you for the update!

For both:
Acked-by: Peter Ujfalusi <[email protected]>

>
> Fixes: a074ae38f859 ("dmaengine: Add driver for TI DMA crossbar on DRA7x")
> Signed-off-by: Miaoqian Lin <[email protected]>
> ---
> changes in v3:
> - rebase so it can apply with the other patch
> changes in v2:
> - split v1 into two patches.
> v1 link:
> https://lore.kernel.org/r/[email protected]
> v2 link:
> https://lore.kernel.org/r/[email protected]/
> ---
> drivers/dma/ti/dma-crossbar.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/dma/ti/dma-crossbar.c b/drivers/dma/ti/dma-crossbar.c
> index e34cfb50d241..f744ddbbbad7 100644
> --- a/drivers/dma/ti/dma-crossbar.c
> +++ b/drivers/dma/ti/dma-crossbar.c
> @@ -245,6 +245,7 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec,
> if (dma_spec->args[0] >= xbar->xbar_requests) {
> dev_err(&pdev->dev, "Invalid XBAR request number: %d\n",
> dma_spec->args[0]);
> + put_device(&pdev->dev);
> return ERR_PTR(-EINVAL);
> }
>
> @@ -252,12 +253,14 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec,
> dma_spec->np = of_parse_phandle(ofdma->of_node, "dma-masters", 0);
> if (!dma_spec->np) {
> dev_err(&pdev->dev, "Can't get DMA master\n");
> + put_device(&pdev->dev);
> return ERR_PTR(-EINVAL);
> }
>
> map = kzalloc(sizeof(*map), GFP_KERNEL);
> if (!map) {
> of_node_put(dma_spec->np);
> + put_device(&pdev->dev);
> return ERR_PTR(-ENOMEM);
> }
>
> @@ -269,6 +272,7 @@ static void *ti_dra7_xbar_route_allocate(struct of_phandle_args *dma_spec,
> dev_err(&pdev->dev, "Run out of free DMA requests\n");
> kfree(map);
> of_node_put(dma_spec->np);
> + put_device(&pdev->dev);
> return ERR_PTR(-ENOMEM);
> }
> set_bit(map->xbar_out, xbar->dma_inuse);

--
Péter

2022-06-09 06:04:53

by Vinod Koul

Subject: Re: [PATCH v3 1/2] dmaengine: ti: Fix refcount leak in ti_dra7_xbar_route_allocate

On 05-06-22, 08:27, Miaoqian Lin wrote:
> of_parse_phandle() returns a node pointer with refcount
> incremented, we should use of_node_put() on it when not needed anymore.
>
> Add missing of_node_put() in to fix this.

Applied both, thanks

--
~Vinod