Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d34e2cba authored by Lukas Wunner's avatar Lukas Wunner Committed by Greg Kroah-Hartman
Browse files

spi: pxa2xx: Fix use-after-free on unbind 



commit 5626308bb94d9f930aa5f7c77327df4c6daa7759 upstream

pxa2xx_spi_remove() accesses the driver's private data after calling
spi_unregister_controller() even though that function releases the last
reference on the spi_controller and thereby frees the private data.

Fix by switching over to the new devm_spi_alloc_master/slave() helper
which keeps the private data accessible until the driver has unbound.

Fixes: 32e5b57232c0 ("spi: pxa2xx: Fix controller unregister order")
Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Cc: <stable@vger.kernel.org> # v2.6.17+: 5e844cc37a5c: spi: Introduce device-managed SPI controller allocation
Cc: <stable@vger.kernel.org> # v2.6.17+: 32e5b57232c0: spi: pxa2xx: Fix controller unregister order
Cc: <stable@vger.kernel.org> # v2.6.17+
Link: https://lore.kernel.org/r/5764b04d4a6e43069ebb7808f64c2f774ac6f193.1607286887.git.lukas@wunner.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
[sudip: adjust context]
Signed-off-by: default avatarSudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f30c728d

drivers/spi/spi-pxa2xx.c

+1 −2
Original line number Diff line number Diff line
@@ -1572,7 +1572,7 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	master = spi_alloc_master(dev, sizeof(struct driver_data));

	master = devm_spi_alloc_master(dev, sizeof(*drv_data));

	if (!master) {

		dev_err(&pdev->dev, "cannot alloc spi_master\n");

		pxa_ssp_free(ssp);
@@ -1759,7 +1759,6 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) 
	free_irq(ssp->irq, drv_data);



out_error_master_alloc:

	spi_controller_put(master);

	pxa_ssp_free(ssp);

	return status;

}