[PATCH] ep93xx: clock: Fix UAF in mach-ep93xx/clock.c

[PATCH] ep93xx: clock: Fix UAF in mach-ep93xx/clock.c

[Wan Jiabing]

Fix following coccicheck errors:
./arch/arm/mach-ep93xx/clock.c:351:9-12: ERROR: reference preceded by free on line 349
./arch/arm/mach-ep93xx/clock.c:458:9-12: ERROR: reference preceded by free on line 456

Fix two more potential UAF errors.

Link: https://lore.kernel.org/all/20220418121212.634259061@linuxfoundation.org/
Fixes: 9645ccc7bd7a ("ep93xx: clock: convert in-place to COMMON_CLK")
Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
---
 arch/arm/mach-ep93xx/clock.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c
index 4fa6ea5461b7..35f3734e512c 100644
--- a/arch/arm/mach-ep93xx/clock.c
+++ b/arch/arm/mach-ep93xx/clock.c
@@ -345,8 +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,8 +454,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.35.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ep93xx: clock: Fix UAF in mach-ep93xx/clock.c

[Alexander Sverdlin]

Thank you, Wan!

On Wed, 2022-04-27 at 10:21 +0800, Wan Jiabing wrote:
> Fix following coccicheck errors:
> ./arch/arm/mach-ep93xx/clock.c:351:9-12: ERROR: reference preceded by free on line 349
> ./arch/arm/mach-ep93xx/clock.c:458:9-12: ERROR: reference preceded by free on line 456
> 
> Fix two more potential UAF errors.
> 
> Link: https://lore.kernel.org/all/20220418121212.634259061@linuxfoundation.org/
> Fixes: 9645ccc7bd7a ("ep93xx: clock: convert in-place to COMMON_CLK")
> Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>

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

> ---
>  arch/arm/mach-ep93xx/clock.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-ep93xx/clock.c b/arch/arm/mach-ep93xx/clock.c
> index 4fa6ea5461b7..35f3734e512c 100644
> --- a/arch/arm/mach-ep93xx/clock.c
> +++ b/arch/arm/mach-ep93xx/clock.c
> @@ -345,8 +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,8 +454,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.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH] ep93xx: clock: Fix UAF in mach-ep93xx/clock.c

[Greg KH]

On Wed, Apr 27, 2022 at 10:21:11AM +0800, Wan Jiabing wrote:
> Fix following coccicheck errors:
> ./arch/arm/mach-ep93xx/clock.c:351:9-12: ERROR: reference preceded by free on line 349
> ./arch/arm/mach-ep93xx/clock.c:458:9-12: ERROR: reference preceded by free on line 456
> 
> Fix two more potential UAF errors.
> 
> Link: https://lore.kernel.org/all/20220418121212.634259061@linuxfoundation.org/
> Fixes: 9645ccc7bd7a ("ep93xx: clock: convert in-place to COMMON_CLK")
> Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
> ---
>  arch/arm/mach-ep93xx/clock.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)

<formletter>

This is not the correct way to submit patches for inclusion in the
stable kernel tree.  Please read:
    https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.

</formletter>

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel