From a610d5d4fb37171011b1ef9201888276440e0348 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Mon, 12 Jan 2015 17:12:24 +0100 Subject: [PATCH] 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: 391c970c0dd1 ("of/gpio: add default of_xlate function if device has a node pointer") Fixes: 664e3e5ac64c ("gpio / ACPI: register to ACPI events automatically") Signed-off-by: Johan Hovold Signed-off-by: Linus Walleij [lizf: Backported to 3.4: - move the call to of_gpiochip_add() into the above if condition. - remove the call to acpi_gpiochip_remove()] Signed-off-by: Zefan Li --- drivers/gpio/gpiolib.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 112c16e08471f..663570ca2419e 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1081,19 +1081,18 @@ int gpiochip_add(struct gpio_chip *chip) ? (1 << FLAG_IS_OUT) : 0; } - } - of_gpiochip_add(chip); + of_gpiochip_add(chip); + } unlock: spin_unlock_irqrestore(&gpio_lock, flags); - if (status) - goto fail; - status = gpiochip_export(chip); - if (status) + if (status) { + of_gpiochip_remove(chip); goto fail; + } pr_info("gpiochip_add: registered GPIOs %d to %d on device: %s\n", chip->base, chip->base + chip->ngpio - 1, -- 2.47.2