Skip to contentSkip to conversation

dmaengine: ti: Fix refcount leak in ti_dra7_xbar_route_allocate

PATCH Superseded Miaoqian Lin 2 participants 3 messages May 12, 2022 – May 16, 2022

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dmaengine: ti: Fix refcount leak in ti_dra7_xbar_route_allocate

1. of_find_device_by_node() takes reference, we should use put_device() to release it when not need anymore.
2. of_parse_phandle() returns a node pointer with refcount incremented, we should use of_node_put() on it when not needed anymore.

Add put_device() and of_node_put() in some error paths to fix.

Fixes ec9bfa1e1a79 ("dmaengine: ti-dma-crossbar: dra7: Use bitops instead of idr")
Fixes a074ae38f859 ("dmaengine: Add driver for TI DMA crossbar on DRA7x")
---
 drivers/dma/ti/dma-crossbar.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/dma/ti/dma-crossbar.c +5 -0
index 71d24fc07c00..f744ddbbbad7 100644
@@ -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);
 	}
 
@@ -268,6 +271,8 @@ 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);
+		put_device(&pdev->dev);
 		return ERR_PTR(-ENOMEM);
 	}
 	set_bit(map->xbar_out, xbar->dma_inuse);
Signature · 1 line
2.25.1
#1 lore raw
Quoted 6 lines · Miaoqian Lin

1. of_find_device_by_node() takes reference, we should use put_device() to release it when not need anymore.
2. of_parse_phandle() returns a node pointer with refcount incremented, we should use of_node_put() on it when not needed anymore.

Add put_device() and of_node_put() in some error paths to fix.

Sounds like you need 2 patches for this? One just for the put_device() and the other for the of_node_put()?

Quoted 44 lines
Fixes ec9bfa1e1a79 ("dmaengine: ti-dma-crossbar: dra7: Use bitops instead of idr")
Fixes a074ae38f859 ("dmaengine: Add driver for TI DMA crossbar on DRA7x")
---
  drivers/dma/ti/dma-crossbar.c | 5 +++++
  1 file changed, 5 insertions(+)
drivers/dma/ti/dma-crossbar.c +5 -0
index 71d24fc07c00..f744ddbbbad7 100644
@@ -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);
  	}
 
@@ -268,6 +271,8 @@ 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);
+		put_device(&pdev->dev);
  		return ERR_PTR(-ENOMEM);
  	}
  	set_bit(map->xbar_out, xbar->dma_inuse);
#2 lore raw

Hi, Dave

Quoted 9 lines · Dave Jiang
Quoted 6 lines · Miaoqian Lin

1. of_find_device_by_node() takes reference, we should use put_device() to release it when not need anymore.
2. of_parse_phandle() returns a node pointer with refcount incremented, we should use of_node_put() on it when not needed anymore.

Add put_device() and of_node_put() in some error paths to fix.

Sounds like you need 2 patches for this? One just for the put_device() and the other for the of_node_put()?

Thanks for your response, I will split it into 2 patches.

Quoted 41 lines
Quoted 41 lines
Fixes ec9bfa1e1a79 ("dmaengine: ti-dma-crossbar: dra7: Use bitops instead of idr")
Fixes a074ae38f859 ("dmaengine: Add driver for TI DMA crossbar on DRA7x")

---
  drivers/dma/ti/dma-crossbar.c | 5 +++++

  1 file changed, 5 insertions(+)
drivers/dma/ti/dma-crossbar.c +1 -0
index 71d24fc07c00..f744ddbbbad7 100644
@@ -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);
      }
  @@ -268,6 +271,8 @@ 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);
+        put_device(&pdev->dev);
          return ERR_PTR(-ENOMEM);
      }
      set_bit(map->xbar_out, xbar->dma_inuse);