[<prev] [next>] [day] [month] [year] [list]
Message-ID: <159082479679.17951.6915233076766027126.tip-bot2@tip-bot2>
Date: Sat, 30 May 2020 07:46:36 -0000
From: "tip-bot2 for Dan Carpenter" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Dan Carpenter <dan.carpenter@...cle.com>,
Marc Zyngier <maz@...nel.org>, x86 <x86@...nel.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: [tip: irq/core] iio: dummy_evgen: Fix use after free on error in
iio_dummy_evgen_create()
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 128516e49de67d10d52fba62ef8d482b220ac4b0
Gitweb: https://git.kernel.org/tip/128516e49de67d10d52fba62ef8d482b220ac4b0
Author: Dan Carpenter <dan.carpenter@...cle.com>
AuthorDate: Wed, 20 May 2020 15:03:06 +03:00
Committer: Marc Zyngier <maz@...nel.org>
CommitterDate: Wed, 20 May 2020 13:11:41 +01:00
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")
Signed-off-by: Dan Carpenter <dan.carpenter@...cle.com>
Signed-off-by: Marc Zyngier <maz@...nel.org>
---
drivers/iio/dummy/iio_dummy_evgen.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/dummy/iio_dummy_evgen.c b/drivers/iio/dummy/iio_dummy_evgen.c
index 409fe0f..ee85d59 100644
--- a/drivers/iio/dummy/iio_dummy_evgen.c
+++ b/drivers/iio/dummy/iio_dummy_evgen.c
@@ -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);
Powered by blists - more mailing lists