Re: [PATCH] gpio: fix resource unwinding order in error path

[Bartosz Golaszewski]

On Thu, Feb 29, 2024 at 6:25 PM Bartosz Golaszewski <brgl@xxxxxxxx> wrote:
>
> From: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
>
> Hogs are added *after* ACPI so should be removed *before* in error path.
>
> Fixes: 6d86750ce623 ("gpio: fix gpio leak in gpiochip_add error path")
> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
> ---
>  drivers/gpio/gpiolib.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
> index 21edc5eafa68..7fd9c59e73c5 100644
> --- a/drivers/gpio/gpiolib.c
> +++ b/drivers/gpio/gpiolib.c
> @@ -1025,11 +1025,11 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,
>
>         ret = gpiochip_irqchip_init_valid_mask(gc);
>         if (ret)
> -               goto err_remove_acpi_chip;
> +               goto err_free_hogs;
>
>         ret = gpiochip_irqchip_init_hw(gc);
>         if (ret)
> -               goto err_remove_acpi_chip;
> +               goto err_remove_irqchip_mask;
>
>         ret = gpiochip_add_irqchip(gc, lock_key, request_key);
>         if (ret)
> @@ -1054,11 +1054,11 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,
>         gpiochip_irqchip_remove(gc);
>  err_remove_irqchip_mask:
>         gpiochip_irqchip_free_valid_mask(gc);
> -err_remove_acpi_chip:
> +err_free_hogs:
> +       gpiochip_free_hogs(gc);
>         acpi_gpiochip_remove(gc);
>         gpiochip_remove_pin_ranges(gc);
>  err_remove_of_chip:
> -       gpiochip_free_hogs(gc);
>         of_gpiochip_remove(gc);
>  err_cleanup_desc_srcu:
>         for (i = 0; i < gdev->ngpio; i++)
> --
> 2.40.1
>

Queued for fixes.

Bart