]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
gpio: sim: dispose of irq mappings before destroying the irq_sim domain
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Tue, 22 Aug 2023 19:29:42 +0000 (21:29 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Aug 2023 14:11:13 +0000 (16:11 +0200)
[ Upstream commit ab4109f91b328ff5cb5e1279f64d443241add2d1 ]

If a GPIO simulator device is unbound with interrupts still requested,
we will hit a use-after-free issue in __irq_domain_deactivate_irq(). The
owner of the irq domain must dispose of all mappings before destroying
the domain object.

Fixes: cb8c474e79be ("gpio: sim: new testing module")
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpio/gpio-sim.c

index fef12e57b1f13f338216faedc4049cfe8b6c8ffe..3fa123bb72ee1ac09518bda66a9993ce3a8bf64a 100644 (file)
@@ -290,6 +290,15 @@ static void gpio_sim_mutex_destroy(void *data)
        mutex_destroy(lock);
 }
 
+static void gpio_sim_dispose_mappings(void *data)
+{
+       struct gpio_sim_chip *chip = data;
+       unsigned int i;
+
+       for (i = 0; i < chip->gc.ngpio; i++)
+               irq_dispose_mapping(irq_find_mapping(chip->irq_sim, i));
+}
+
 static void gpio_sim_sysfs_remove(void *data)
 {
        struct gpio_sim_chip *chip = data;
@@ -402,6 +411,10 @@ static int gpio_sim_add_bank(struct fwnode_handle *swnode, struct device *dev)
        if (IS_ERR(chip->irq_sim))
                return PTR_ERR(chip->irq_sim);
 
+       ret = devm_add_action_or_reset(dev, gpio_sim_dispose_mappings, chip);
+       if (ret)
+               return ret;
+
        mutex_init(&chip->lock);
        ret = devm_add_action_or_reset(dev, gpio_sim_mutex_destroy,
                                       &chip->lock);