Return-Path: From: lizf@kernel.org To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Johan Hovold , Linus Walleij , Zefan Li Subject: [PATCH 3.4 100/176] gpio: fix memory and reference leaks in gpiochip_add error path Date: Thu, 9 Apr 2015 16:45:48 +0800 Message-Id: <1428569224-23820-100-git-send-email-lizf@kernel.org> In-Reply-To: <1428569028-23762-1-git-send-email-lizf@kernel.org> References: <1428569028-23762-1-git-send-email-lizf@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: From: Johan Hovold 3.4.107-rc1 review patch. If anyone has any objections, please let me know. ------------------ 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 112c16e..663570c 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, -- 1.9.1