From: Navid Emamdoost <navid.emamdoost@gmail.com> To: michal.simek@xilinx.com Cc: emamd001@umn.edu, smccaman@umn.edu, kjlu@umn.edu, Markus.Elfring@web.de, Navid Emamdoost <navid.emamdoost@gmail.com>, Daniel Lezcano <daniel.lezcano@linaro.org>, Thomas Gleixner <tglx@linutronix.de>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] clocksource/drivers: Fix error handling in ttc_setup_clocksource Date: Tue, 22 Oct 2019 23:47:36 -0500 [thread overview] Message-ID: <20191023044737.2824-1-navid.emamdoost@gmail.com> (raw) In-Reply-To: <2a6cdb63-397b-280a-7379-740e8f43ddf6@xilinx.com> In the implementation of ttc_setup_clocksource() when clk_notifier_register() fails the execution should go to error handling. Additionally, to avoid memory leak the allocated memory for ttccs should be released, too. So, goto error handling to release the memory and return. Fixes: e932900a3279 ("arm: zynq: Use standard timer binding") Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> --- drivers/clocksource/timer-cadence-ttc.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/clocksource/timer-cadence-ttc.c b/drivers/clocksource/timer-cadence-ttc.c index 88fe2e9ba9a3..035e16bc17d3 100644 --- a/drivers/clocksource/timer-cadence-ttc.c +++ b/drivers/clocksource/timer-cadence-ttc.c @@ -328,10 +328,8 @@ static int __init ttc_setup_clocksource(struct clk *clk, void __iomem *base, ttccs->ttc.clk = clk; err = clk_prepare_enable(ttccs->ttc.clk); - if (err) { - kfree(ttccs); - return err; - } + if (err) + goto release_ttccs; ttccs->ttc.freq = clk_get_rate(ttccs->ttc.clk); @@ -341,8 +339,10 @@ static int __init ttc_setup_clocksource(struct clk *clk, void __iomem *base, err = clk_notifier_register(ttccs->ttc.clk, &ttccs->ttc.clk_rate_change_nb); - if (err) + if (err) { pr_warn("Unable to register clock notifier.\n"); + goto release_ttccs; + } ttccs->ttc.base_addr = base; ttccs->cs.name = "ttc_clocksource"; @@ -363,16 +363,18 @@ static int __init ttc_setup_clocksource(struct clk *clk, void __iomem *base, ttccs->ttc.base_addr + TTC_CNT_CNTRL_OFFSET); err = clocksource_register_hz(&ttccs->cs, ttccs->ttc.freq / PRESCALE); - if (err) { - kfree(ttccs); - return err; - } + if (err) + goto release_ttccs; ttc_sched_clock_val_reg = base + TTC_COUNT_VAL_OFFSET; sched_clock_register(ttc_sched_clock_read, timer_width, ttccs->ttc.freq / PRESCALE); return 0; + +release_ttccs: + kfree(ttccs); + return err; } static int ttc_rate_change_clockevent_cb(struct notifier_block *nb, -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Navid Emamdoost <navid.emamdoost@gmail.com> To: michal.simek@xilinx.com Cc: Daniel Lezcano <daniel.lezcano@linaro.org>, kjlu@umn.edu, linux-kernel@vger.kernel.org, emamd001@umn.edu, Markus.Elfring@web.de, smccaman@umn.edu, Thomas Gleixner <tglx@linutronix.de>, linux-arm-kernel@lists.infradead.org, Navid Emamdoost <navid.emamdoost@gmail.com> Subject: [PATCH] clocksource/drivers: Fix error handling in ttc_setup_clocksource Date: Tue, 22 Oct 2019 23:47:36 -0500 [thread overview] Message-ID: <20191023044737.2824-1-navid.emamdoost@gmail.com> (raw) In-Reply-To: <2a6cdb63-397b-280a-7379-740e8f43ddf6@xilinx.com> In the implementation of ttc_setup_clocksource() when clk_notifier_register() fails the execution should go to error handling. Additionally, to avoid memory leak the allocated memory for ttccs should be released, too. So, goto error handling to release the memory and return. Fixes: e932900a3279 ("arm: zynq: Use standard timer binding") Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> --- drivers/clocksource/timer-cadence-ttc.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/clocksource/timer-cadence-ttc.c b/drivers/clocksource/timer-cadence-ttc.c index 88fe2e9ba9a3..035e16bc17d3 100644 --- a/drivers/clocksource/timer-cadence-ttc.c +++ b/drivers/clocksource/timer-cadence-ttc.c @@ -328,10 +328,8 @@ static int __init ttc_setup_clocksource(struct clk *clk, void __iomem *base, ttccs->ttc.clk = clk; err = clk_prepare_enable(ttccs->ttc.clk); - if (err) { - kfree(ttccs); - return err; - } + if (err) + goto release_ttccs; ttccs->ttc.freq = clk_get_rate(ttccs->ttc.clk); @@ -341,8 +339,10 @@ static int __init ttc_setup_clocksource(struct clk *clk, void __iomem *base, err = clk_notifier_register(ttccs->ttc.clk, &ttccs->ttc.clk_rate_change_nb); - if (err) + if (err) { pr_warn("Unable to register clock notifier.\n"); + goto release_ttccs; + } ttccs->ttc.base_addr = base; ttccs->cs.name = "ttc_clocksource"; @@ -363,16 +363,18 @@ static int __init ttc_setup_clocksource(struct clk *clk, void __iomem *base, ttccs->ttc.base_addr + TTC_CNT_CNTRL_OFFSET); err = clocksource_register_hz(&ttccs->cs, ttccs->ttc.freq / PRESCALE); - if (err) { - kfree(ttccs); - return err; - } + if (err) + goto release_ttccs; ttc_sched_clock_val_reg = base + TTC_COUNT_VAL_OFFSET; sched_clock_register(ttc_sched_clock_read, timer_width, ttccs->ttc.freq / PRESCALE); return 0; + +release_ttccs: + kfree(ttccs); + return err; } static int ttc_rate_change_clockevent_cb(struct notifier_block *nb, -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-10-23 4:47 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-21 20:18 [PATCH] clocksource/drivers: Fix memory leak in ttc_setup_clockevent Navid Emamdoost 2019-10-21 20:18 ` Navid Emamdoost 2019-10-22 8:26 ` Markus Elfring 2019-10-22 8:26 ` Markus Elfring 2019-10-22 8:26 ` Markus Elfring 2019-10-22 8:51 ` Michal Simek 2019-10-22 8:51 ` Michal Simek 2019-10-22 8:51 ` Michal Simek 2019-10-23 4:31 ` [PATCH v2] " Navid Emamdoost 2019-10-23 4:31 ` Navid Emamdoost 2019-10-23 7:32 ` Michal Simek 2019-10-23 7:32 ` Michal Simek 2019-10-23 8:00 ` Markus Elfring 2019-10-23 8:00 ` Markus Elfring 2019-10-23 8:00 ` Markus Elfring 2019-10-23 4:47 ` Navid Emamdoost [this message] 2019-10-23 4:47 ` [PATCH] clocksource/drivers: Fix error handling in ttc_setup_clocksource Navid Emamdoost 2019-10-23 7:24 ` Markus Elfring 2019-10-23 7:24 ` Markus Elfring 2019-10-23 7:24 ` Markus Elfring 2019-10-23 8:20 ` Markus Elfring 2019-10-23 8:20 ` Markus Elfring 2019-10-23 8:20 ` Markus Elfring 2019-10-23 10:31 ` Markus Elfring 2019-10-23 10:31 ` Markus Elfring 2019-10-23 10:31 ` Markus Elfring 2019-12-14 22:54 ` Navid Emamdoost 2019-12-14 22:54 ` Navid Emamdoost 2019-12-16 13:41 ` Daniel Lezcano 2019-12-16 13:41 ` Daniel Lezcano 2019-12-17 15:09 ` Michal Simek 2019-12-17 15:09 ` Michal Simek 2019-10-23 4:50 ` [PATCH] clocksource/drivers: Fix memory leak in ttc_setup_clockevent Navid Emamdoost 2019-10-23 4:50 ` Navid Emamdoost 2019-10-23 4:50 ` Navid Emamdoost
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191023044737.2824-1-navid.emamdoost@gmail.com \ --to=navid.emamdoost@gmail.com \ --cc=Markus.Elfring@web.de \ --cc=daniel.lezcano@linaro.org \ --cc=emamd001@umn.edu \ --cc=kjlu@umn.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=michal.simek@xilinx.com \ --cc=smccaman@umn.edu \ --cc=tglx@linutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.