Skip to content

Commit 530b5af

Browse files
saschahauerbroonie
authored andcommitted
spi: fsl-dspi: fix use-after-free in remove path
spi_unregister_controller() not only unregisters the controller, but also frees the controller. This will free the driver data with it, so we must not access it later dspi_remove(). Solve this by allocating the driver data separately from the SPI controller. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Link: https://lore.kernel.org/r/20200923131026.20707-1-s.hauer@pengutronix.de Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent b867eef commit 530b5af

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

drivers/spi/spi-fsl-dspi.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,11 +1273,14 @@ static int dspi_probe(struct platform_device *pdev)
12731273
void __iomem *base;
12741274
bool big_endian;
12751275

1276-
ctlr = spi_alloc_master(&pdev->dev, sizeof(struct fsl_dspi));
1276+
dspi = devm_kzalloc(&pdev->dev, sizeof(*dspi), GFP_KERNEL);
1277+
if (!dspi)
1278+
return -ENOMEM;
1279+
1280+
ctlr = spi_alloc_master(&pdev->dev, 0);
12771281
if (!ctlr)
12781282
return -ENOMEM;
12791283

1280-
dspi = spi_controller_get_devdata(ctlr);
12811284
dspi->pdev = pdev;
12821285
dspi->ctlr = ctlr;
12831286

@@ -1414,7 +1417,7 @@ static int dspi_probe(struct platform_device *pdev)
14141417
if (dspi->devtype_data->trans_mode != DSPI_DMA_MODE)
14151418
ctlr->ptp_sts_supported = true;
14161419

1417-
platform_set_drvdata(pdev, ctlr);
1420+
platform_set_drvdata(pdev, dspi);
14181421

14191422
ret = spi_register_controller(ctlr);
14201423
if (ret != 0) {
@@ -1437,8 +1440,7 @@ static int dspi_probe(struct platform_device *pdev)
14371440

14381441
static int dspi_remove(struct platform_device *pdev)
14391442
{
1440-
struct spi_controller *ctlr = platform_get_drvdata(pdev);
1441-
struct fsl_dspi *dspi = spi_controller_get_devdata(ctlr);
1443+
struct fsl_dspi *dspi = platform_get_drvdata(pdev);
14421444

14431445
/* Disconnect from the SPI framework */
14441446
spi_unregister_controller(dspi->ctlr);

0 commit comments

Comments
 (0)