[v2] ep93xx: clock: Do not return the address of the freed memory

[PATCH v2] ep93xx: clock: Do not return the address of the freed memory

Posted by Genjian Zhang 3 years, 11 months ago

Avoid return freed memory addresses,Modified to the actual error
return value of clk_register().

Fixes: 9645ccc7bd7a ("ep93xx: clock: convert in-place to COMMON_CLK")
Signed-off-by: Genjian Zhang <zhanggenjian@kylinos.cn>
---
 arch/arm/mach-ep93xx/clock.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c
index 4fa6ea5461b7..85a496ddc619 100644
--- a/arch/arm/mach-ep93xx/clock.c
+++ b/arch/arm/mach-ep93xx/clock.c
@@ -345,9 +345,10 @@ static struct clk_hw *clk_hw_register_ddiv(const char *name,
 	psc->hw.init = &init;
 
 	clk = clk_register(NULL, &psc->hw);
-	if (IS_ERR(clk))
+	if (IS_ERR(clk)) {
 		kfree(psc);
-
+		return ERR_CAST(clk);
+	}
 	return &psc->hw;
 }
 
@@ -452,9 +453,10 @@ static struct clk_hw *clk_hw_register_div(const char *name,
 	psc->hw.init = &init;
 
 	clk = clk_register(NULL, &psc->hw);
-	if (IS_ERR(clk))
+	if (IS_ERR(clk)) {
 		kfree(psc);
-
+		return ERR_CAST(clk);
+	}
 	return &psc->hw;
 }
 
-- 
2.25.1

Re: [PATCH v2] ep93xx: clock: Do not return the address of the freed memory

Posted by Alexander Sverdlin 3 years, 11 months ago

Thank you Genjian!

On Tue, 2022-05-17 at 15:39 +0800, Genjian Zhang wrote:
> Avoid return freed memory addresses,Modified to the actual error
> return value of clk_register().
> 
> Fixes: 9645ccc7bd7a ("ep93xx: clock: convert in-place to COMMON_CLK")
> Signed-off-by: Genjian Zhang <zhanggenjian@kylinos.cn>

Acked-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>

> ---
>  arch/arm/mach-ep93xx/clock.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c
> index 4fa6ea5461b7..85a496ddc619 100644
> --- a/arch/arm/mach-ep93xx/clock.c
> +++ b/arch/arm/mach-ep93xx/clock.c
> @@ -345,9 +345,10 @@ static struct clk_hw *clk_hw_register_ddiv(const char *name,
>         psc->hw.init = &init;
>  
>         clk = clk_register(NULL, &psc->hw);
> -       if (IS_ERR(clk))
> +       if (IS_ERR(clk)) {
>                 kfree(psc);
> -
> +               return ERR_CAST(clk);
> +       }
>         return &psc->hw;
>  }
>  
> @@ -452,9 +453,10 @@ static struct clk_hw *clk_hw_register_div(const char *name,
>         psc->hw.init = &init;
>  
>         clk = clk_register(NULL, &psc->hw);
> -       if (IS_ERR(clk))
> +       if (IS_ERR(clk)) {
>                 kfree(psc);
> -
> +               return ERR_CAST(clk);
> +       }
>         return &psc->hw;
>  }
>  

-- 
Alexander Sverdlin.