Skip to content

Commit

Permalink
gpio: fix memory and reference leaks in gpiochip_add error path
Browse files Browse the repository at this point in the history
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: 391c970 ("of/gpio: add default of_xlate function if device
has a node pointer")
Fixes: 664e3e5 ("gpio / ACPI: register to ACPI events
automatically")
Cc: stable <stable@vger.kernel.org>

Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Johan Hovold authored and Linus Walleij committed Jan 14, 2015
1 parent e733a2f commit 5539b3c
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions drivers/gpio/gpiolib.c
Original file line number Diff line number Diff line change
Expand Up @@ -277,19 +277,22 @@ int gpiochip_add(struct gpio_chip *chip)

spin_unlock_irqrestore(&gpio_lock, flags);

if (status)
goto fail;

#ifdef CONFIG_PINCTRL
INIT_LIST_HEAD(&chip->pin_ranges);
#endif

of_gpiochip_add(chip);
acpi_gpiochip_add(chip);

if (status)
goto fail;

status = gpiochip_export(chip);
if (status)
if (status) {
acpi_gpiochip_remove(chip);
of_gpiochip_remove(chip);
goto fail;
}

pr_debug("%s: registered GPIOs %d to %d on device: %s\n", __func__,
chip->base, chip->base + chip->ngpio - 1,
Expand Down

0 comments on commit 5539b3c

Please sign in to comment.