2023-07-11 15:20:56

by Geert Uytterhoeven

[permalink] [raw]
Subject: [PATCH] clk: imx93: Propagate correct error in imx93_clocks_probe()

smatch reports:

drivers/clk/imx/clk-imx93.c:294 imx93_clocks_probe() error: uninitialized symbol 'base'.

Indeed, in case of an error, the wrong (yet uninitialized) variable is
converted to an error code and returned.
Fix this by propagating the error code in the correct variable.

Fixes: e02ba11b45764705 ("clk: imx93: fix memory leak and missing unwind goto in imx93_clocks_probe")
Reported-by: Dan Carpenter <[email protected]>
Closes: https://lore.kernel.org/all/[email protected]
Reported-by: kernel test robot <[email protected]>
Closes: https://lore.kernel.org/all/[email protected]/
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
drivers/clk/imx/clk-imx93.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/imx/clk-imx93.c b/drivers/clk/imx/clk-imx93.c
index b6c7c2725906c574..44f435103c65a8ee 100644
--- a/drivers/clk/imx/clk-imx93.c
+++ b/drivers/clk/imx/clk-imx93.c
@@ -291,7 +291,7 @@ static int imx93_clocks_probe(struct platform_device *pdev)
anatop_base = devm_of_iomap(dev, np, 0, NULL);
of_node_put(np);
if (WARN_ON(IS_ERR(anatop_base))) {
- ret = PTR_ERR(base);
+ ret = PTR_ERR(anatop_base);
goto unregister_hws;
}

--
2.34.1



2023-07-12 00:47:38

by Peng Fan

[permalink] [raw]
Subject: RE: [PATCH] clk: imx93: Propagate correct error in imx93_clocks_probe()



> -----Original Message-----
> From: Geert Uytterhoeven <[email protected]>
> Sent: 2023??7??11?? 23:08
> To: Zhanhao Hu <[email protected]>; Abel Vesa
> <[email protected]>; Dan Carpenter <[email protected]>; Peng
> Fan <[email protected]>; Michael Turquette <[email protected]>;
> Stephen Boyd <[email protected]>; Shawn Guo <[email protected]>;
> Sascha Hauer <[email protected]>; Pengutronix Kernel Team
> <[email protected]>; Fabio Estevam <[email protected]>
> Cc: dl-linux-imx <[email protected]>; kernel test robot <[email protected]>;
> [email protected]; [email protected]; linux-
> [email protected]; Geert Uytterhoeven <[email protected]>
> Subject: [PATCH] clk: imx93: Propagate correct error in imx93_clocks_probe()
>
> smatch reports:
>
> drivers/clk/imx/clk-imx93.c:294 imx93_clocks_probe() error: uninitialized
> symbol 'base'.
>
> Indeed, in case of an error, the wrong (yet uninitialized) variable is
> converted to an error code and returned.
> Fix this by propagating the error code in the correct variable.
>
> Fixes: e02ba11b45764705 ("clk: imx93: fix memory leak and missing unwind
> goto in imx93_clocks_probe")
> Reported-by: Dan Carpenter <[email protected]>
> Closes:
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.
> kernel.org%2Fall%2F9c2acd81-3ad8-485d-819e-
> 9e4201277831%40kadam.mountain&data=05%7C01%7Cpeng.fan%40nxp.co
> m%7Caac4262700fd4d8926c808db8220abe8%7C686ea1d3bc2b4c6fa92cd99
> c5c301635%7C0%7C0%7C638246849056820470%7CUnknown%7CTWFpbGZs
> b3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6M
> n0%3D%7C3000%7C%7C%7C&sdata=fBtWgLEciWjDlsr9sklMJ%2BgQ9WVgBl
> q%2FdSK92so0K0E%3D&reserved=0
> Reported-by: kernel test robot <[email protected]>
> Closes:
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.
> kernel.org%2Fall%2F202306161533.4YDmL22b-
> lkp%40intel.com%2F&data=05%7C01%7Cpeng.fan%40nxp.com%7Caac4262
> 700fd4d8926c808db8220abe8%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C
> 0%7C0%7C638246849056820470%7CUnknown%7CTWFpbGZsb3d8eyJWIjoi
> MC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C30
> 00%7C%7C%7C&sdata=bwieb46snU2Z7WCVS3ca4sqKyF%2FV0axCXokIAgVr
> dGY%3D&reserved=0
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> ---
> drivers/clk/imx/clk-imx93.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/clk/imx/clk-imx93.c b/drivers/clk/imx/clk-imx93.c index
> b6c7c2725906c574..44f435103c65a8ee 100644
> --- a/drivers/clk/imx/clk-imx93.c
> +++ b/drivers/clk/imx/clk-imx93.c
> @@ -291,7 +291,7 @@ static int imx93_clocks_probe(struct
> platform_device *pdev)
> anatop_base = devm_of_iomap(dev, np, 0, NULL);
> of_node_put(np);
> if (WARN_ON(IS_ERR(anatop_base))) {
> - ret = PTR_ERR(base);
> + ret = PTR_ERR(anatop_base);
> goto unregister_hws;
> }
>

Reviewed-by: Peng Fan <[email protected]>
> --
> 2.34.1

2023-07-19 21:55:46

by Stephen Boyd

[permalink] [raw]
Subject: Re: [PATCH] clk: imx93: Propagate correct error in imx93_clocks_probe()

Quoting Geert Uytterhoeven (2023-07-11 08:08:12)
> smatch reports:
>
> drivers/clk/imx/clk-imx93.c:294 imx93_clocks_probe() error: uninitialized symbol 'base'.
>
> Indeed, in case of an error, the wrong (yet uninitialized) variable is
> converted to an error code and returned.
> Fix this by propagating the error code in the correct variable.
>
> Fixes: e02ba11b45764705 ("clk: imx93: fix memory leak and missing unwind goto in imx93_clocks_probe")
> Reported-by: Dan Carpenter <[email protected]>
> Closes: https://lore.kernel.org/all/[email protected]
> Reported-by: kernel test robot <[email protected]>
> Closes: https://lore.kernel.org/all/[email protected]/
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> ---

Applied to clk-fixes