Skip to contentSkip to conversation

spi: s3c64xx: potential oops on probe error

PATCH In review Dan Carpenter 4 participants 4 messages Jan 13, 2017 – Jan 17, 2017

Subsystems (4)
Kernel janitors SPI Arm Samsung Exynos Samsung SPI drivers
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 spi: s3c64xx: potential oops on probe error

We accidentally mixed up freeing the rx and tx channels which would a leak and an oops.

Fixes 3d63a47a380a ("spi: s3c64xx: Don't request/release DMA channels for each SPI transfer")
Signed-off-by Dan Carpenter <[email protected]>
drivers/spi/spi-s3c64xx.c +4 -4
index 849ee82..b8cd356 100644
@@ -1147,7 +1147,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 		if (IS_ERR(sdd->tx_dma.ch)) {
 			dev_err(&pdev->dev, "Failed to get TX DMA channel\n");
 			ret = PTR_ERR(sdd->tx_dma.ch);
-			goto err_release_tx_dma;
+			goto err_release_rx_dma;
 		}
 	}
 

@@ -1197,10 +1197,10 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 	pm_runtime_set_suspended(&pdev->dev);
 
 	if (!is_polling(sdd))
-		dma_release_channel(sdd->rx_dma.ch);
-err_release_tx_dma:
-	if (!is_polling(sdd))
 		dma_release_channel(sdd->tx_dma.ch);
+err_release_rx_dma:
+	if (!is_polling(sdd))
+		dma_release_channel(sdd->rx_dma.ch);
 err_disable_io_clk:
 	clk_disable_unprepare(sdd->ioclk);
 err_disable_src_clk:
Acked-by on v1 1/1
#1 lore raw

Hi Dan,

Quoted 5 lines · Dan Carpenter

We accidentally mixed up freeing the rx and tx channels which would a leak and an oops.

Fixes 3d63a47a380a ("spi: s3c64xx: Don't request/release DMA channels for each SPI transfer")
Signed-off-by Dan Carpenter <[email protected]>

Right, my fault. Thanks for the fix!

Acked-by Marek Szyprowski <[email protected]>
Quoted 28 lines
drivers/spi/spi-s3c64xx.c +4 -5
index 849ee82..b8cd356 100644
@@ -1147,7 +1147,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
  		if (IS_ERR(sdd->tx_dma.ch)) {
  			dev_err(&pdev->dev, "Failed to get TX DMA channel\n");
  			ret = PTR_ERR(sdd->tx_dma.ch);
-			goto err_release_tx_dma;
+			goto err_release_rx_dma;
  		}
  	}
 

@@ -1197,10 +1197,10 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
  	pm_runtime_set_suspended(&pdev->dev);
 
  	if (!is_polling(sdd))
-		dma_release_channel(sdd->rx_dma.ch);
-err_release_tx_dma:
-	if (!is_polling(sdd))
  		dma_release_channel(sdd->tx_dma.ch);
+err_release_rx_dma:
+	if (!is_polling(sdd))
+		dma_release_channel(sdd->rx_dma.ch);
  err_disable_io_clk:
  	clk_disable_unprepare(sdd->ioclk);
  err_disable_src_clk:
--
Quoted 5 lines

To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Best regards

Signature · 2 lines
Marek Szyprowski, PhD
Samsung R&D Institute Poland
Acked-by on v1 1/1
#2 lore raw
In reply to Dan Carpenter
Quoted 5 lines · Dan Carpenter

We accidentally mixed up freeing the rx and tx channels which would a leak and an oops.

Fixes 3d63a47a380a ("spi: s3c64xx: Don't request/release DMA channels for each SPI transfer")
Signed-off-by Dan Carpenter <[email protected]>

Thanks, Dan.

Acked-by Andi Shyti <[email protected]>

Andi

Quoted 29 lines
drivers/spi/spi-s3c64xx.c +4 -4
index 849ee82..b8cd356 100644
@@ -1147,7 +1147,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 		if (IS_ERR(sdd->tx_dma.ch)) {
 			dev_err(&pdev->dev, "Failed to get TX DMA channel\n");
 			ret = PTR_ERR(sdd->tx_dma.ch);
-			goto err_release_tx_dma;
+			goto err_release_rx_dma;
 		}
 	}
 

@@ -1197,10 +1197,10 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 	pm_runtime_set_suspended(&pdev->dev);
 
 	if (!is_polling(sdd))
-		dma_release_channel(sdd->rx_dma.ch);
-err_release_tx_dma:
-	if (!is_polling(sdd))
 		dma_release_channel(sdd->tx_dma.ch);
+err_release_rx_dma:
+	if (!is_polling(sdd))
+		dma_release_channel(sdd->rx_dma.ch);
 err_disable_io_clk:
 	clk_disable_unprepare(sdd->ioclk);
 err_disable_src_clk:
maintainer
#3 lore raw

Applied "spi: s3c64xx: potential oops on probe error" to the spi tree

In reply to Dan Carpenter

The patch

spi: s3c64xx: potential oops on probe error

has been applied to the spi tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git

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

From 72bc7ae0633e2b580217d254114ac6650380b7f6 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <[email protected]>
Date: Fri, 13 Jan 2017 10:42:53 +0300
Subject: [PATCH] spi: s3c64xx: potential oops on probe error

We accidentally mixed up freeing the rx and tx channels which would a leak and an oops.

Fixes 3d63a47a380a ("spi: s3c64xx: Don't request/release DMA channels for each SPI transfer")
Signed-off-by Dan Carpenter <[email protected]>
Acked-by Marek Szyprowski <[email protected]>
Acked-by Andi Shyti <[email protected]>
Signed-off-by Mark Brown <[email protected]>
---
 drivers/spi/spi-s3c64xx.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/spi/spi-s3c64xx.c +4 -4
index 849ee82483e4..b8cd356d8d10 100644
@@ -1147,7 +1147,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 		if (IS_ERR(sdd->tx_dma.ch)) {
 			dev_err(&pdev->dev, "Failed to get TX DMA channel\n");
 			ret = PTR_ERR(sdd->tx_dma.ch);
-			goto err_release_tx_dma;
+			goto err_release_rx_dma;
 		}
 	}
 

@@ -1197,10 +1197,10 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
 	pm_runtime_set_suspended(&pdev->dev);
 
 	if (!is_polling(sdd))
-		dma_release_channel(sdd->rx_dma.ch);
-err_release_tx_dma:
-	if (!is_polling(sdd))
 		dma_release_channel(sdd->tx_dma.ch);
+err_release_rx_dma:
+	if (!is_polling(sdd))
+		dma_release_channel(sdd->rx_dma.ch);
 err_disable_io_clk:
 	clk_disable_unprepare(sdd->ioclk);
 err_disable_src_clk:
Signature · 1 line
2.11.0