Commit 185419ab authored by Johan Hovold's avatar Johan Hovold Committed by Luis Henriques

gpio: fix memory and reference leaks in gpiochip_add error path

commit 5539b3c9 upstream.

Memory allocated and references taken by of_gpiochip_add and
acpi_gpiochip_add were never released on errors in gpiochip_add (e.g.
failure to find free gpio range).

Fixes: 391c970c ("of/gpio: add default of_xlate function if device
has a node pointer")
Fixes: 664e3e5a ("gpio / ACPI: register to ACPI events
automatically")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 9086ea6d
...@@ -1223,6 +1223,9 @@ int gpiochip_add(struct gpio_chip *chip) ...@@ -1223,6 +1223,9 @@ int gpiochip_add(struct gpio_chip *chip)
spin_unlock_irqrestore(&gpio_lock, flags); spin_unlock_irqrestore(&gpio_lock, flags);
if (status)
goto fail;
#ifdef CONFIG_PINCTRL #ifdef CONFIG_PINCTRL
INIT_LIST_HEAD(&chip->pin_ranges); INIT_LIST_HEAD(&chip->pin_ranges);
#endif #endif
...@@ -1230,12 +1233,12 @@ int gpiochip_add(struct gpio_chip *chip) ...@@ -1230,12 +1233,12 @@ int gpiochip_add(struct gpio_chip *chip)
of_gpiochip_add(chip); of_gpiochip_add(chip);
acpi_gpiochip_add(chip); acpi_gpiochip_add(chip);
if (status)
goto fail;
status = gpiochip_export(chip); status = gpiochip_export(chip);
if (status) if (status) {
acpi_gpiochip_remove(chip);
of_gpiochip_remove(chip);
goto fail; goto fail;
}
pr_debug("%s: registered GPIOs %d to %d on device: %s\n", __func__, pr_debug("%s: registered GPIOs %d to %d on device: %s\n", __func__,
chip->base, chip->base + chip->ngpio - 1, chip->base, chip->base + chip->ngpio - 1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment