Skip to contentSkip to conversation

soc: fsl: dpio: Use after free in dpaa2_dpio_remove()

PATCH Applied Dan Carpenter 2 participants 2 messages Feb 4, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 soc: fsl: dpio: Use after free in dpaa2_dpio_remove()

The dpaa2_io_down(priv->io) call frees "priv->io" so I've shifted the code around a little bit to avoid the use after free.

Fixes 991e873223e9 ("soc: fsl: dpio: use a cpumask to identify which cpus are unused")
---
 drivers/soc/fsl/dpio/dpio-driver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/fsl/dpio/dpio-driver.c +1 -1
index 2d4af32a0dec..a28799b62d53 100644
@@ -220,12 +220,12 @@ static int dpaa2_dpio_remove(struct fsl_mc_device *dpio_dev)
 
 	dev = &dpio_dev->dev;
 	priv = dev_get_drvdata(dev);
+	cpu = dpaa2_io_get_cpu(priv->io);
 
 	dpaa2_io_down(priv->io);
 
 	dpio_teardown_irqs(dpio_dev);
 
-	cpu = dpaa2_io_get_cpu(priv->io);
 	cpumask_set_cpu(cpu, cpus_unused_mask);
 
 	err = dpio_open(dpio_dev->mc_io, 0, dpio_dev->obj_desc.id,
Signature · 1 line
2.17.1
Applied
#1 lore raw
Quoted 6 lines · Dan Carpenter

The dpaa2_io_down(priv->io) call frees "priv->io" so I've shifted the code around a little bit to avoid the use after free.

Fixes 991e873223e9 ("soc: fsl: dpio: use a cpumask to identify which cpus are unused")

Applied. Thanks.

Quoted 25 lines
---
 drivers/soc/fsl/dpio/dpio-driver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/fsl/dpio/dpio-driver.c +1 -2
index 2d4af32a0dec..a28799b62d53 100644
@@ -220,12 +220,12 @@ static int dpaa2_dpio_remove(struct fsl_mc_device *dpio_dev)
 
        dev = &dpio_dev->dev;
        priv = dev_get_drvdata(dev);
+       cpu = dpaa2_io_get_cpu(priv->io);
 
        dpaa2_io_down(priv->io);
 
        dpio_teardown_irqs(dpio_dev);
 
-       cpu = dpaa2_io_get_cpu(priv->io);
        cpumask_set_cpu(cpu, cpus_unused_mask);
 
        err = dpio_open(dpio_dev->mc_io, 0, dpio_dev->obj_desc.id,
--

2.17.1