Skip to contentSkip to conversation

spi: fix device-node leaks

PATCH In review Johan Hovold 2 participants 2 messages Jan 30, 2017 – Jan 31, 2017 SPI

lore
Share & tools
lore

Johan Hovold

author
#0 lore raw

PATCH 1/1 spi: fix device-node leaks

Make sure to release the device-node reference taken in of_register_spi_device() on errors and when deregistering the device.

Fixes 284b01897340 ("spi: Add OF binding support for SPI busses")
Signed-off-by Johan Hovold <[email protected]>
---
 drivers/spi/spi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/spi/spi.c +6 -2
index 656dd3e3220c..730e3c9794db 100644
@@ -621,8 +621,10 @@ void spi_unregister_device(struct spi_device *spi)
 	if (!spi)
 		return;
 
-	if (spi->dev.of_node)
+	if (spi->dev.of_node) {
 		of_node_clear_flag(spi->dev.of_node, OF_POPULATED);
+		of_node_put(spi->dev.of_node);
+	}
 	if (ACPI_COMPANION(&spi->dev))
 		acpi_device_clear_enumerated(ACPI_COMPANION(&spi->dev));
 	device_unregister(&spi->dev);

@@ -1603,11 +1605,13 @@ of_register_spi_device(struct spi_master *master, struct device_node *nc)
 	if (rc) {
 		dev_err(&master->dev, "spi_device register error %s\n",
 			nc->full_name);
-		goto err_out;
+		goto err_of_node_put;
 	}
 
 	return spi;
 
+err_of_node_put:
+	of_node_put(nc);
 err_out:
 	spi_dev_put(spi);
 	return ERR_PTR(rc);
Signature · 1 line
2.10.2
maintainer
#1 lore raw

Applied "spi: fix device-node leaks" to the spi tree

The patch

spi: fix device-node leaks

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

Quoted 1 line

From 8324147f38019865b29d03baf28412d2ec0bd828 Mon Sep 17 00:00:00 2001

From: Johan Hovold <[email protected]>
Date: Mon, 30 Jan 2017 17:47:05 +0100
Subject: [PATCH] spi: fix device-node leaks

Make sure to release the device-node reference taken in of_register_spi_device() on errors and when deregistering the device.

Fixes 284b01897340 ("spi: Add OF binding support for SPI busses")
Signed-off-by Johan Hovold <[email protected]>
Signed-off-by Mark Brown <[email protected]>
---
 drivers/spi/spi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/spi/spi.c +6 -2
index 8c05f27bf642..59cb26470d70 100644
@@ -621,8 +621,10 @@ void spi_unregister_device(struct spi_device *spi)
 	if (!spi)
 		return;
 
-	if (spi->dev.of_node)
+	if (spi->dev.of_node) {
 		of_node_clear_flag(spi->dev.of_node, OF_POPULATED);
+		of_node_put(spi->dev.of_node);
+	}
 	if (ACPI_COMPANION(&spi->dev))
 		acpi_device_clear_enumerated(ACPI_COMPANION(&spi->dev));
 	device_unregister(&spi->dev);

@@ -1603,11 +1605,13 @@ of_register_spi_device(struct spi_master *master, struct device_node *nc)
 	if (rc) {
 		dev_err(&master->dev, "spi_device register error %s\n",
 			nc->full_name);
-		goto err_out;
+		goto err_of_node_put;
 	}
 
 	return spi;
 
+err_of_node_put:
+	of_node_put(nc);
 err_out:
 	spi_dev_put(spi);
 	return ERR_PTR(rc);
Signature · 1 line
2.11.0