2011-03-07 05:50:55

by Axel Lin

Subject: [PATCH 1/2] [ARM] am200epd: fix resource leak in am200_init_gpio_regs error path

If gpio_request fails when i > 0, gpios[0] is not freed in current
implementation.

Signed-off-by: Axel Lin <[email protected]>
---
arch/arm/mach-pxa/am200epd.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-pxa/am200epd.c b/arch/arm/mach-pxa/am200epd.c
index 3499fad..811d797 100644
--- a/arch/arm/mach-pxa/am200epd.c
+++ b/arch/arm/mach-pxa/am200epd.c
@@ -128,8 +128,8 @@ static int am200_init_gpio_regs(struct metronomefb_par *par)
return 0;

err_req_gpio:
- while (i > 0)
- gpio_free(gpios[i--]);
+ while (--i >= 0)
+ gpio_free(gpios[i]);

return err;
}
--
1.7.2

2011-03-07 05:51:47

by Axel Lin

Subject: [PATCH 2/2] [ARM] am300epd: fix resource leak in am300_init_gpio_regs error path

If gpio_request fails when i > 0, gpios[0] is not freed in current
implementation.

Signed-off-by: Axel Lin <[email protected]>
---
arch/arm/mach-pxa/am300epd.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-pxa/am300epd.c b/arch/arm/mach-pxa/am300epd.c
index 993d75e..fa8bad2 100644
--- a/arch/arm/mach-pxa/am300epd.c
+++ b/arch/arm/mach-pxa/am300epd.c
@@ -125,10 +125,7 @@ static int am300_init_gpio_regs(struct broadsheetfb_par *par)
if (err) {
dev_err(&am300_device->dev, "failed requesting "
"gpio %d, err=%d\n", i, err);
- while (i >= DB0_GPIO_PIN)
- gpio_free(i--);
- i = ARRAY_SIZE(gpios) - 1;
- goto err_req_gpio;
+ goto err_req_gpio2;
}
}

@@ -159,9 +156,13 @@ static int am300_init_gpio_regs(struct broadsheetfb_par *par)

return 0;

+err_req_gpio2:
+ while (--i >= DB0_GPIO_PIN)
+ gpio_free(i);
+ i = ARRAY_SIZE(gpios);
err_req_gpio:
- while (i > 0)
- gpio_free(gpios[i--]);
+ while (--i >= 0)
+ gpio_free(gpios[i]);

return err;
}
--
1.7.2

2011-03-17 15:07:15

by Eric Miao

Subject: Re: [PATCH 2/2] [ARM] am300epd: fix resource leak in am300_init_gpio_regs error path

Applied.

On Mon, Mar 7, 2011 at 1:56 PM, Axel Lin <[email protected]> wrote:
> If gpio_request fails when i > 0, gpios[0] is not freed in current
> implementation.
>
> Signed-off-by: Axel Lin <[email protected]>
> ---
>  arch/arm/mach-pxa/am300epd.c |   13 +++++++------
>  1 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/am300epd.c b/arch/arm/mach-pxa/am300epd.c
> index 993d75e..fa8bad2 100644
> --- a/arch/arm/mach-pxa/am300epd.c
> +++ b/arch/arm/mach-pxa/am300epd.c
> @@ -125,10 +125,7 @@ static int am300_init_gpio_regs(struct broadsheetfb_par *par)
>                if (err) {
>                        dev_err(&am300_device->dev, "failed requesting "
>                                "gpio %d, err=%d\n", i, err);
> -                       while (i >= DB0_GPIO_PIN)
> -                               gpio_free(i--);
> -                       i = ARRAY_SIZE(gpios) - 1;
> -                       goto err_req_gpio;
> +                       goto err_req_gpio2;
>                }
>        }
>
> @@ -159,9 +156,13 @@ static int am300_init_gpio_regs(struct broadsheetfb_par *par)
>
>        return 0;
>
> +err_req_gpio2:
> +       while (--i >= DB0_GPIO_PIN)
> +               gpio_free(i);
> +       i = ARRAY_SIZE(gpios);
>  err_req_gpio:
> -       while (i > 0)
> -               gpio_free(gpios[i--]);
> +       while (--i >= 0)
> +               gpio_free(gpios[i]);
>
>        return err;
>  }
> --
> 1.7.2
>
>
>
>
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m????????????I?

2011-03-17 15:07:27

by Eric Miao

Subject: Re: [PATCH 1/2] [ARM] am200epd: fix resource leak in am200_init_gpio_regs error path

Applied.

On Mon, Mar 7, 2011 at 1:55 PM, Axel Lin <[email protected]> wrote:
> If gpio_request fails when i > 0, gpios[0] is not freed in current
> implementation.
>
> Signed-off-by: Axel Lin <[email protected]>
> ---
>  arch/arm/mach-pxa/am200epd.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/am200epd.c b/arch/arm/mach-pxa/am200epd.c
> index 3499fad..811d797 100644
> --- a/arch/arm/mach-pxa/am200epd.c
> +++ b/arch/arm/mach-pxa/am200epd.c
> @@ -128,8 +128,8 @@ static int am200_init_gpio_regs(struct metronomefb_par *par)
>        return 0;
>
>  err_req_gpio:
> -       while (i > 0)
> -               gpio_free(gpios[i--]);
> +       while (--i >= 0)
> +               gpio_free(gpios[i]);
>
>        return err;
>  }
> --
> 1.7.2
>
>
>
>