2015-05-04 15:23:48

by Johan Hovold

Subject: [PATCH] gpio: fix gpio leak in gpiochip_add error path

Make sure to free any hogged gpios on errors in gpiochip_add.

Also move all forward declarations to the top of the file.

Fixes: f625d4601759 ("gpio: add GPIO hogging mechanism")
Signed-off-by: Johan Hovold <[email protected]>
---

Here's another fix for 4.1.

Johan


drivers/gpio/gpiolib.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 2ce3df3504e6..3b0b063ceb76 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -53,6 +53,11 @@ static DEFINE_MUTEX(gpio_lookup_lock);
static LIST_HEAD(gpio_lookup_list);
LIST_HEAD(gpio_chips);

+
+static void gpiochip_free_hogs(struct gpio_chip *chip);
+static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip);
+
+
static inline void desc_set_label(struct gpio_desc *d, const char *label)
{
d->label = label;
@@ -297,6 +302,7 @@ int gpiochip_add(struct gpio_chip *chip)

err_remove_chip:
acpi_gpiochip_remove(chip);
+ gpiochip_free_hogs(chip);
of_gpiochip_remove(chip);
spin_lock_irqsave(&gpio_lock, flags);
list_del(&chip->list);
@@ -313,10 +319,6 @@ err_free_descs:
}
EXPORT_SYMBOL_GPL(gpiochip_add);

-/* Forward-declaration */
-static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip);
-static void gpiochip_free_hogs(struct gpio_chip *chip);
-
/**
* gpiochip_remove() - unregister a gpio_chip
* @chip: the chip to unregister
--
2.0.5

2015-05-12 07:01:06

by Alexandre Courbot

Subject: Re: [PATCH] gpio: fix gpio leak in gpiochip_add error path

On Tue, May 5, 2015 at 12:23 AM, Johan Hovold <[email protected]> wrote:
> Make sure to free any hogged gpios on errors in gpiochip_add.
>
> Also move all forward declarations to the top of the file.
>
> Fixes: f625d4601759 ("gpio: add GPIO hogging mechanism")
> Signed-off-by: Johan Hovold <[email protected]>

Reviewed-by: Alexandre Courbot <[email protected]>

2015-05-12 08:57:18

by Linus Walleij

Subject: Re: [PATCH] gpio: fix gpio leak in gpiochip_add error path

On Mon, May 4, 2015 at 5:23 PM, Johan Hovold <[email protected]> wrote:

> Make sure to free any hogged gpios on errors in gpiochip_add.
>
> Also move all forward declarations to the top of the file.
>
> Fixes: f625d4601759 ("gpio: add GPIO hogging mechanism")
> Signed-off-by: Johan Hovold <[email protected]>

Applied for fixes.

Yours,
Linus Walleij