Skip to content

Commit

Permalink
spi: fsl-dspi: fix use-after-free in remove path
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sascha Hauer authored and Mark Brown committed Sep 23, 2020
1 parent b867eef commit 530b5af
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions drivers/spi/spi-fsl-dspi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1273,11 +1273,14 @@ static int dspi_probe(struct platform_device *pdev)
void __iomem *base;
bool big_endian;

ctlr = spi_alloc_master(&pdev->dev, sizeof(struct fsl_dspi));
dspi = devm_kzalloc(&pdev->dev, sizeof(*dspi), GFP_KERNEL);
if (!dspi)
return -ENOMEM;

ctlr = spi_alloc_master(&pdev->dev, 0);
if (!ctlr)
return -ENOMEM;

dspi = spi_controller_get_devdata(ctlr);
dspi->pdev = pdev;
dspi->ctlr = ctlr;

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

platform_set_drvdata(pdev, ctlr);
platform_set_drvdata(pdev, dspi);

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

static int dspi_remove(struct platform_device *pdev)
{
struct spi_controller *ctlr = platform_get_drvdata(pdev);
struct fsl_dspi *dspi = spi_controller_get_devdata(ctlr);
struct fsl_dspi *dspi = platform_get_drvdata(pdev);

/* Disconnect from the SPI framework */
spi_unregister_controller(dspi->ctlr);
Expand Down

0 comments on commit 530b5af

Please sign in to comment.