spi: fix use-after-free at controller deregistration
Subsystems (3)
PATCH v2 1/3 spi: fix use-after-free at controller deregistration
The controller is typically freed as part of device_unregister() so store the bus id before deregistration to avoid use-after-free when the id is later released.
--- drivers/spi/spi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/spi/spi.c +3 -2
@@ -2245,11 +2245,12 @@ static int __unregister(struct device *dev, void *null)void spi_unregister_controller (struct spi_controller *ctlr) {struct spi_controller *found; +int id = ctlr->bus_num;int dummy;/* First make sure that this controller was ever added */ mutex_lock (&board_lock); - found =idr_find (&spi_master_idr, ctlr->bus_num); + found =idr_find (&spi_master_idr, id);mutex_unlock (&board_lock);if (found != ctlr) { dev_dbg(&ctlr->dev,
@@ -2269,7 +2270,7 @@ void spi_unregister_controller(struct spi_controller *ctlr)device_unregister (&ctlr->dev);/* free bus id */ mutex_lock (&board_lock); -idr_remove (&spi_master_idr, ctlr->bus_num); +idr_remove (&spi_master_idr, id);mutex_unlock (&board_lock); }EXPORT_SYMBOL_GPL (spi_unregister_controller);
Signature · 1 line
2.14.3
PATCH v2 2/3 spi: document odd controller reference handling
Document the fact that a reference to the controller is dropped as part of deregistration.
This is an odd pattern as the reference is typically taken in __spi_alloc_controller() rather than spi_register_controller(). Most controller drivers gets it right these days and notably the device-managed interface relies on this behaviour.
--- drivers/spi/spi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/spi/spi.c +3 -1
@@ -2200,7 +2200,7 @@ static void devm_spi_unregister(struct device *dev, void *res)* Context: can sleep * * Register a SPI device as with spi_register_controller() which will -* automatically be unregister +* automatically be unregistered and freed. * * Return: zero on success, else a negative error code. */
@@ -2241,6 +2241,8 @@ static int __unregister(struct device *dev, void *null)* only ones directly touching chip registers. * * This must be called from context that can sleep. +* +* Note that this function also drops a reference to the controller. */ void spi_unregister_controller (struct spi_controller *ctlr) {
Signature · 6 lines
2.14.3 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 3/3 spi: spi-axi: fix potential use-after-free after deregistration
In reply to Johan HovoldTake an extra reference to the controller before deregistering it to prevent use-after-free in the interrupt handler in case an interrupt fires before the line is disabled.
---
v2
- Add Fixes tag and update commit message to reflect that this is a potential issue also for this driver (and not just for drivers using shared interrupts) as noted by Lars-Peter.
drivers/spi/spi-axi-spi-engine.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/spi/spi-axi-spi-engine.c +3 -1
@@ -553,7 +553,7 @@ static int spi_engine_probe(struct platform_device *pdev)static int spi_engine_remove (struct platform_device *pdev) { -struct spi_master *master =platform_get_drvdata (pdev); +struct spi_master *master =spi_master_get (platform_get_drvdata (pdev));struct spi_engine *spi_engine =spi_master_get_devdata (master);int irq =platform_get_irq (pdev,0 );
@@ -561,6 +561,8 @@ static int spi_engine_remove(struct platform_device *pdev)free_irq (irq, master); +spi_master_put (master); +writel_relaxed (0xff , spi_engine->base +SPI_ENGINE_REG_INT_PENDING );writel_relaxed (0x00 , spi_engine->base +SPI_ENGINE_REG_INT_ENABLE );writel_relaxed (0x01 , spi_engine->base +SPI_ENGINE_REG_RESET );
Signature · 1 line
2.14.3