[PATCH] clk: versatile: free icst on error return

[PATCH] clk: versatile: free icst on error return

[Colin King]

From: Colin Ian King <colin.king@canonical.com>

commit a183da63 introduced a new error return path that does
not kfree icst if the kmemdup of desc->params fails.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/clk/versatile/clk-icst.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/clk/versatile/clk-icst.c b/drivers/clk/versatile/clk-icst.c
index a820b0c..eb3a1e4 100644
--- a/drivers/clk/versatile/clk-icst.c
+++ b/drivers/clk/versatile/clk-icst.c
@@ -140,6 +140,7 @@ struct clk *icst_clk_register(struct device *dev,
 
 	pclone = kmemdup(desc->params, sizeof(*pclone), GFP_KERNEL);
 	if (!pclone) {
+		kfree(icst);
 		pr_err("could not clone ICST params\n");
 		return ERR_PTR(-ENOMEM);
 	}
-- 
1.9.1

Re: [PATCH] clk: versatile: free icst on error return

[Linus Walleij]

On Sat, Apr 12, 2014 at 7:59 PM, Colin King <colin.king@canonical.com> wrote:

> From: Colin Ian King <colin.king@canonical.com>
>
> commit a183da63 introduced a new error return path that does
> not kfree icst if the kmemdup of desc->params fails.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH] clk: versatile: free icst on error return

[Mike Turquette]

Quoting Colin King (2014-04-12 10:59:14)
> From: Colin Ian King <colin.king@canonical.com>
> 
> commit a183da63 introduced a new error return path that does
> not kfree icst if the kmemdup of desc->params fails.
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Applied to clk-next.

Thanks,
Mike

> ---
>  drivers/clk/versatile/clk-icst.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/clk/versatile/clk-icst.c b/drivers/clk/versatile/clk-icst.c
> index a820b0c..eb3a1e4 100644
> --- a/drivers/clk/versatile/clk-icst.c
> +++ b/drivers/clk/versatile/clk-icst.c
> @@ -140,6 +140,7 @@ struct clk *icst_clk_register(struct device *dev,
>  
>         pclone = kmemdup(desc->params, sizeof(*pclone), GFP_KERNEL);
>         if (!pclone) {
> +               kfree(icst);
>                 pr_err("could not clone ICST params\n");
>                 return ERR_PTR(-ENOMEM);
>         }
> -- 
> 1.9.1
>