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

Commit c8c87c65 authored by Guenter Roeck's avatar Guenter Roeck Committed by Mark Brown
Browse files

spi/mpc52xx-psc: Avoid access to freed memory in device remove function 



The call to spi_unregister_master() in the device remove function frees device
memory, and with it any device local data. However, device local data is still
accessed after the call to spi_unregister_master().

Acquire a reference to the SPI master device and release it after cleanup is
complete to solve the problem.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent f95e1028

drivers/spi/spi-mpc52xx-psc.c

+2 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ static int __devinit mpc52xx_psc_spi_of_probe(struct platform_device *op) 


static int __devexit mpc52xx_psc_spi_of_remove(struct platform_device *op)

{

	struct spi_master *master = dev_get_drvdata(&op->dev);

	struct spi_master *master = spi_master_get(dev_get_drvdata(&op->dev));

	struct mpc52xx_psc_spi *mps = spi_master_get_devdata(master);



	flush_workqueue(mps->workqueue);
@@ -490,6 +490,7 @@ static int __devexit mpc52xx_psc_spi_of_remove(struct platform_device *op) 
	free_irq(mps->irq, mps);

	if (mps->psc)

		iounmap(mps->psc);

	spi_master_put(master);



	return 0;

}