dmaengine: ti: add null check of devm_kasprintf in edma_probe and udma_probe

PATCH Superseded Kang Chen 3 participants 5 messages Feb 26, 2023 – Mar 18, 2023

Subsystems (2)

dmaengine Texas Instruments DMA drivers

lore

Share & tools

lore

Kang Chen

author

2023-02-26 09:40 UTC #0 lore raw

PATCH 1/1 dmaengine: ti: add null check of devm_kasprintf in edma_probe and udma_probe

devm_kasprintf may fails, irq_name and uc->name might be null and wrong irq name will be used in request.

Signed-off-by Kang Chen <[email protected]>

---
 drivers/dma/ti/edma.c    | 8 ++++++++
 drivers/dma/ti/k3-udma.c | 2 ++
 2 files changed, 10 insertions(+)

drivers/dma/ti/edma.c +8 -0

index fa06d7e6d..85cd72b64 100644
@@ -2413,6 +2413,10 @@ static int edma_probe(struct platform_device *pdev)
 	if (irq >= 0) {
 		irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s_ccint",
 					  dev_name(dev));
+		if (!irq_name) {
+			ret = -ENOMEM;
+			goto err_disable_pm;
+		}
 		ret = devm_request_irq(dev, irq, dma_irq_handler, 0, irq_name,
 				       ecc);
 		if (ret) {

@@ -2429,6 +2433,10 @@ static int edma_probe(struct platform_device *pdev)
 	if (irq >= 0) {
 		irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s_ccerrint",
 					  dev_name(dev));
+		if (!irq_name) {
+			ret = -ENOMEM;
+			goto err_disable_pm;
+		}
 		ret = devm_request_irq(dev, irq, dma_ccerr_handler, 0, irq_name,
 				       ecc);
 		if (ret) {

drivers/dma/ti/k3-udma.c +2 -0

index 7e23a6fde..692d1d25c 100644
@@ -5494,6 +5494,8 @@ static int udma_probe(struct platform_device *pdev)
 		uc->config.dir = DMA_MEM_TO_MEM;
 		uc->name = devm_kasprintf(dev, GFP_KERNEL, "%s chan%d",
 					  dev_name(dev), i);
+		if (!uc->name)
+			return -ENOMEM;
 
 		vchan_init(&uc->vc, &ud->ddev);
 		/* Use custom vchan completion handling */

Signature · 1 line

2.34.1

Péter Ujfalusi

Acked-by on v1 1/1

2023-03-14 19:58 UTC #1 lore raw

Hi,

Quoted 2 lines · Kang Chen

devm_kasprintf may fails, irq_name and uc->name might be null and wrong irq name will be used in request.

In general, I would have preferred to have separate patches for the two drivers to make them easier to backport if one decides.

If you decide to resend, you can add my to them:

Acked-by Peter Ujfalusi <[email protected]>

Quoted 46 lines

Signed-off-by Kang Chen <[email protected]>

---
  drivers/dma/ti/edma.c    | 8 ++++++++
  drivers/dma/ti/k3-udma.c | 2 ++
  2 files changed, 10 insertions(+)

drivers/dma/ti/edma.c +8 -0

index fa06d7e6d..85cd72b64 100644
@@ -2413,6 +2413,10 @@ static int edma_probe(struct platform_device *pdev)
  	if (irq >= 0) {
  		irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s_ccint",
  					  dev_name(dev));
+		if (!irq_name) {
+			ret = -ENOMEM;
+			goto err_disable_pm;
+		}
  		ret = devm_request_irq(dev, irq, dma_irq_handler, 0, irq_name,
  				       ecc);
  		if (ret) {

@@ -2429,6 +2433,10 @@ static int edma_probe(struct platform_device *pdev)
  	if (irq >= 0) {
  		irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s_ccerrint",
  					  dev_name(dev));
+		if (!irq_name) {
+			ret = -ENOMEM;
+			goto err_disable_pm;
+		}
  		ret = devm_request_irq(dev, irq, dma_ccerr_handler, 0, irq_name,
  				       ecc);
  		if (ret) {

drivers/dma/ti/k3-udma.c +2 -0

index 7e23a6fde..692d1d25c 100644
@@ -5494,6 +5494,8 @@ static int udma_probe(struct platform_device *pdev)
  		uc->config.dir = DMA_MEM_TO_MEM;
  		uc->name = devm_kasprintf(dev, GFP_KERNEL, "%s chan%d",
  					  dev_name(dev), i);
+		if (!uc->name)
+			return -ENOMEM;
 
  		vchan_init(&uc->vc, &ud->ddev);
  		/* Use custom vchan completion handling */

Signature · 1 line

Péter

Vinod Koul

maintainer

2023-03-17 17:31 UTC #2 lore raw

Quoted 8 lines · Péter Ujfalusi

Hi,
Quoted 2 lines · Kang Chen
devm_kasprintf may fails, irq_name and uc->name might be null and wrong irq name will be used in request.
In general, I would have preferred to have separate patches for the two drivers to make them easier to backport if one decides.

Right these should be separate

Quoted 53 lines

If you decide to resend, you can add my to them:

Acked-by Peter Ujfalusi <[email protected]>

Quoted 45 lines

Signed-off-by Kang Chen <[email protected]>

---
  drivers/dma/ti/edma.c    | 8 ++++++++
  drivers/dma/ti/k3-udma.c | 2 ++
  2 files changed, 10 insertions(+)

drivers/dma/ti/edma.c +8 -0

index fa06d7e6d..85cd72b64 100644
@@ -2413,6 +2413,10 @@ static int edma_probe(struct platform_device *pdev)
  	if (irq >= 0) {
  		irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s_ccint",
  					  dev_name(dev));
+		if (!irq_name) {
+			ret = -ENOMEM;
+			goto err_disable_pm;
+		}
  		ret = devm_request_irq(dev, irq, dma_irq_handler, 0, irq_name,
  				       ecc);
  		if (ret) {

@@ -2429,6 +2433,10 @@ static int edma_probe(struct platform_device *pdev)
  	if (irq >= 0) {
  		irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s_ccerrint",
  					  dev_name(dev));
+		if (!irq_name) {
+			ret = -ENOMEM;
+			goto err_disable_pm;
+		}
  		ret = devm_request_irq(dev, irq, dma_ccerr_handler, 0, irq_name,
  				       ecc);
  		if (ret) {

drivers/dma/ti/k3-udma.c +2 -0

index 7e23a6fde..692d1d25c 100644
@@ -5494,6 +5494,8 @@ static int udma_probe(struct platform_device *pdev)
  		uc->config.dir = DMA_MEM_TO_MEM;
  		uc->name = devm_kasprintf(dev, GFP_KERNEL, "%s chan%d",
  					  dev_name(dev), i);
+		if (!uc->name)
+			return -ENOMEM;
  		vchan_init(&uc->vc, &ud->ddev);
  		/* Use custom vchan completion handling */

Signature · 1 line

Péter

Signature · 1 line

~Vinod

void0red

author

2023-03-18 06:23 UTC #3 lore raw

PATCH v2 1/2 dmaengine: ti: add null check of devm_kasprintf in udma_probe

From: Kang Chen <[email protected]>

devm_kasprintf may fails, uc->name might be null and wrong irq name will be used in request.

Fixes 25dcb5dd7b7c ("dmaengine: ti: New driver for K3 UDMA")

Acked-by Peter Ujfalusi <[email protected]>

Reviewed-by Vinod Koul <[email protected]>

Signed-off-by Kang Chen <[email protected]>

---
v2 -> v1: split into two patches and add some tags

 drivers/dma/ti/k3-udma.c | 2 ++
 1 file changed, 2 insertions(+)

drivers/dma/ti/k3-udma.c +2 -0

index 7e23a6fdef95..692d1d25c70a 100644
@@ -5494,6 +5494,8 @@ static int udma_probe(struct platform_device *pdev)
 		uc->config.dir = DMA_MEM_TO_MEM;
 		uc->name = devm_kasprintf(dev, GFP_KERNEL, "%s chan%d",
 					  dev_name(dev), i);
+		if (!uc->name)
+			return -ENOMEM;
 
 		vchan_init(&uc->vc, &ud->ddev);
 		/* Use custom vchan completion handling */

Signature · 1 line

2.34.1

void0red

author

2023-03-18 06:23 UTC #4 lore raw

PATCH v2 2/2 dmaengine: ti: add null check of devm_kasprintf in edma_probe

From: Kang Chen <[email protected]>

devm_kasprintf may fails, irq_name might be null and wrong irq name will be used in request.

Fixes 2b6b3b742019 ("ARM/dmaengine: edma: Merge the two drivers under drivers/dma/")

Acked-by Peter Ujfalusi <[email protected]>

Reviewed-by Vinod Koul <[email protected]>

Signed-off-by Kang Chen <[email protected]>

---
v2 -> v1: split into two patches and add some tags

 drivers/dma/ti/edma.c | 8 ++++++++
 1 file changed, 8 insertions(+)

drivers/dma/ti/edma.c +8 -0

index fa06d7e6d8e3..85cd72b6401a 100644
@@ -2413,6 +2413,10 @@ static int edma_probe(struct platform_device *pdev)
 	if (irq >= 0) {
 		irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s_ccint",
 					  dev_name(dev));
+		if (!irq_name) {
+			ret = -ENOMEM;
+			goto err_disable_pm;
+		}
 		ret = devm_request_irq(dev, irq, dma_irq_handler, 0, irq_name,
 				       ecc);
 		if (ret) {

@@ -2429,6 +2433,10 @@ static int edma_probe(struct platform_device *pdev)
 	if (irq >= 0) {
 		irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s_ccerrint",
 					  dev_name(dev));
+		if (!irq_name) {
+			ret = -ENOMEM;
+			goto err_disable_pm;
+		}
 		ret = devm_request_irq(dev, irq, dma_ccerr_handler, 0, irq_name,
 				       ecc);
 		if (ret) {

Signature · 1 line

2.34.1