clocksource: timer-imx-gpt: fix potential memory leak

Commit Message

Jacky Bai Oct. 9, 2023, 8:39 a.m. UTC

Fix coverity Issue CID 250382:  Resource leak (RESOURCE_LEAK).
Add kfree when error return.

Signed-off-by: Jacky Bai <[e-mail]>
Reviewed-by: Peng Fan <[e-mail]>
---
 drivers/clocksource/timer-imx-gpt.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

Comments

Daniel Lezcano Oct. 11, 2023, 8:12 a.m. UTC | #1

Hi Jacky,

On 09/10/2023 10:39, Jacky Bai wrote:
> Fix coverity Issue CID 250382:  Resource leak (RESOURCE_LEAK).
> Add kfree when error return.
> 
> Signed-off-by: Jacky Bai <[e-mail]>
> Reviewed-by: Peng Fan <[e-mail]>
> ---
In the future, add lkml@ in Cc also. Also the subject has the format:

	clocksource/drivers/<mydriver> : [AZ].*

Applied [with the subject fixed]

Thanks

   -- Daniel

Patch

diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index 28ab4f1a7c71..6a878d227a13 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -434,12 +434,16 @@  static int __init mxc_timer_init_dt(struct device_node *np,  enum imx_gpt_type t
 		return -ENOMEM;
 
 	imxtm->base = of_iomap(np, 0);
-	if (!imxtm->base)
-		return -ENXIO;
+	if (!imxtm->base) {
+		ret = -ENXIO;
+		goto err_kfree;
+	}
 
 	imxtm->irq = irq_of_parse_and_map(np, 0);
-	if (imxtm->irq <= 0)
-		return -EINVAL;
+	if (imxtm->irq <= 0) {
+		ret = -EINVAL;
+		goto err_kfree;
+	}
 
 	imxtm->clk_ipg = of_clk_get_by_name(np, "ipg");
 
@@ -452,11 +456,15 @@  static int __init mxc_timer_init_dt(struct device_node *np,  enum imx_gpt_type t
 
 	ret = _mxc_timer_init(imxtm);
 	if (ret)
-		return ret;
+		goto err_kfree;
 
 	initialized = 1;
 
 	return 0;
+
+err_kfree:
+	kfree(imxtm);
+	return ret;
 }
 
 static int __init imx1_timer_init_dt(struct device_node *np)