Skip to contentSkip to conversation

iio: dummy_evgen: Fix use after free on error in iio_dummy_evgen_create()

PATCH In review Dan Carpenter 2 participants 2 messages May 20, 2020

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

PATCH 1/1 iio: dummy_evgen: Fix use after free on error in iio_dummy_evgen_create()

We need to preserve the "iio_evgen->irq_sim_domain" error code before we free "iio_evgen" otherwise it leads to a use after free.

Fixes 337cbeb2c13e ("genirq/irq_sim: Simplify the API")
---
 drivers/iio/dummy/iio_dummy_evgen.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/iio/dummy/iio_dummy_evgen.c +4 -1
index 409fe0f7df1c..ee85d596e528 100644
@@ -45,6 +45,8 @@ static struct iio_dummy_eventgen *iio_evgen;
 
 static int iio_dummy_evgen_create(void)
 {
+	int ret;
+
 	iio_evgen = kzalloc(sizeof(*iio_evgen), GFP_KERNEL);
 	if (!iio_evgen)
 		return -ENOMEM;
@@ -52,8 +54,9 @@ static int iio_dummy_evgen_create(void)
 	iio_evgen->irq_sim_domain = irq_domain_create_sim(NULL,
 							  IIO_EVENTGEN_NO);
 	if (IS_ERR(iio_evgen->irq_sim_domain)) {
+		ret = PTR_ERR(iio_evgen->irq_sim_domain);
 		kfree(iio_evgen);
-		return PTR_ERR(iio_evgen->irq_sim_domain);
+		return ret;
 	}
 
 	mutex_init(&iio_evgen->lock);
Signature · 1 line
2.26.2
#1 lore raw

Hi Dan,

Quoted 24 lines · Dan Carpenter

We need to preserve the "iio_evgen->irq_sim_domain" error code before we free "iio_evgen" otherwise it leads to a use after free.

Fixes 337cbeb2c13e ("genirq/irq_sim: Simplify the API")
---
 drivers/iio/dummy/iio_dummy_evgen.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/iio/dummy/iio_dummy_evgen.c +2 -0
index 409fe0f7df1c..ee85d596e528 100644
@@ -45,6 +45,8 @@ static struct iio_dummy_eventgen *iio_evgen;
 
 static int iio_dummy_evgen_create(void)
 {
+	int ret;
+
 	iio_evgen = kzalloc(sizeof(*iio_evgen), GFP_KERNEL);
 	if (!iio_evgen)
 		return -ENOMEM;

drivers/iio/dummy/iio_dummy_evgen.c static int iio_dummy_evgen_create(void) · line 62

Quoted 10 lines
drivers/iio/dummy/iio_dummy_evgen.c +2 -1
@@ -52,8 +54,9 @@ static int iio_dummy_evgen_create(void)
 	iio_evgen->irq_sim_domain = irq_domain_create_sim(NULL,
 							  IIO_EVENTGEN_NO);
 	if (IS_ERR(iio_evgen->irq_sim_domain)) {
+		ret = PTR_ERR(iio_evgen->irq_sim_domain);
 		kfree(iio_evgen);
-		return PTR_ERR(iio_evgen->irq_sim_domain);
+		return ret;
 	}
 
 	mutex_init(&iio_evgen->lock);

Nice catch. I've applied it to irq/irqchip-next, since the offending patch is queued there.

Thanks,

         M.
Signature · 1 line
Jazz is not dead. It just smells funny...