Commit e1c76d69 authored Jan 12, 2015 by Johan Hovold Committed by Greg Kroah-Hartman Jan 27, 2015

gpio: fix memory and reference leaks in gpiochip_add error path



commit 5539b3c938d64a60cb1fc442ac3ce9263d52de0c 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: Johan Hovold <johan@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent fe7930b6

drivers/gpio/gpiolib.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -268,6 +268,9 @@ 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
		@@ -275,12 +278,12 @@ int gpiochip_add(struct gpio_chip *chip)
		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,