[<prev] [next>] [day] [month] [year] [list]
Message-ID: <169843099292.3135.663516180882506542.tip-bot2@tip-bot2>
Date: Fri, 27 Oct 2023 18:23:12 -0000
From: "tip-bot2 for Jacky Bai" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Jacky Bai <ping.bai@....com>, Peng Fan <peng.fan@....com>,
Daniel Lezcano <daniel.lezcano@...aro.org>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: timers/core] clocksource/drivers/timer-imx-gpt: Fix potential
memory leak
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 8051a993ce222a5158bccc6ac22ace9253dd71cb
Gitweb: https://git.kernel.org/tip/8051a993ce222a5158bccc6ac22ace9253dd71cb
Author: Jacky Bai <ping.bai@....com>
AuthorDate: Mon, 09 Oct 2023 16:39:22 +08:00
Committer: Daniel Lezcano <daniel.lezcano@...aro.org>
CommitterDate: Wed, 11 Oct 2023 10:10:34 +02:00
clocksource/drivers/timer-imx-gpt: Fix potential memory leak
Fix coverity Issue CID 250382: Resource leak (RESOURCE_LEAK).
Add kfree when error return.
Signed-off-by: Jacky Bai <ping.bai@....com>
Reviewed-by: Peng Fan <peng.fan@....com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@...aro.org>
Link: https://lore.kernel.org/r/20231009083922.1942971-1-ping.bai@nxp.com
---
drivers/clocksource/timer-imx-gpt.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index 28ab4f1..6a878d2 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)
Powered by blists - more mailing lists