From: Walter Harms <wharms@bfs.de>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
"mturquette@baylibre.com" <mturquette@baylibre.com>,
"sboyd@kernel.org" <sboyd@kernel.org>,
"gregory.clement@bootlin.com" <gregory.clement@bootlin.com>,
"thomas.petazzoni@free-electrons.com"
<thomas.petazzoni@free-electrons.com>
Cc: "linux-clk@vger.kernel.org" <linux-clk@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"kernel-janitors@vger.kernel.org"
<kernel-janitors@vger.kernel.org>
Subject: AW: [PATCH 1/4] clk: mvebu: Fix a memory leak in an error handling path
Date: Fri, 23 Apr 2021 11:42:30 +0000 [thread overview]
Message-ID: <3e38da0e86c045d3aefd46f375e8b48e@bfs.de> (raw)
In-Reply-To: <27db232fdd14e14d493f29a5404d9e643f09cc96.1619157996.git.christophe.jaillet@wanadoo.fr>
nitpicking:
clk_name could be replaced with cpuclk[cpu].clk_name
and the commit msg is from the other patch (free cpuclk[cpu].clk_name)
jm2c,
re,
wh
________________________________________
Von: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Gesendet: Freitag, 23. April 2021 08:25:01
An: mturquette@baylibre.com; sboyd@kernel.org; gregory.clement@bootlin.com; thomas.petazzoni@free-electrons.com
Cc: linux-clk@vger.kernel.org; linux-kernel@vger.kernel.org; kernel-janitors@vger.kernel.org; Christophe JAILLET
Betreff: [PATCH 1/4] clk: mvebu: Fix a memory leak in an error handling path
WARNUNG: Diese E-Mail kam von außerhalb der Organisation. Klicken Sie nicht auf Links oder öffnen Sie keine Anhänge, es sei denn, Sie kennen den/die Absender*in und wissen, dass der Inhalt sicher ist.
If an error occurs in the for_each loop, clk_name must be freed.
In order to do so, sightly rearrange the code:
- move the allocation to simplify error handling
- use kasprintf instead of kzalloc/sprintf to simplify code and avoid a
magic number
Fixes: ab8ba01b3fe5 ("clk: mvebu: add armada-370-xp CPU specific clocks")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
The { } around the 1 line block after kasprintf is intentional and makes
sense with 2/2
---
drivers/clk/mvebu/clk-cpu.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/clk/mvebu/clk-cpu.c b/drivers/clk/mvebu/clk-cpu.c
index c2af3395cf13..a11d7273fcc7 100644
--- a/drivers/clk/mvebu/clk-cpu.c
+++ b/drivers/clk/mvebu/clk-cpu.c
@@ -195,17 +195,17 @@ static void __init of_cpu_clk_setup(struct device_node *node)
for_each_of_cpu_node(dn) {
struct clk_init_data init;
struct clk *clk;
- char *clk_name = kzalloc(5, GFP_KERNEL);
+ char *clk_name;
int cpu, err;
- if (WARN_ON(!clk_name))
- goto bail_out;
-
err = of_property_read_u32(dn, "reg", &cpu);
if (WARN_ON(err))
goto bail_out;
- sprintf(clk_name, "cpu%d", cpu);
+ clk_name = kasprintf(GFP_KERNEL, "cpu%d", cpu);
+ if (WARN_ON(!clk_name)) {
+ goto bail_out;
+ }
cpuclk[cpu].parent_name = of_clk_get_parent_name(node, 0);
cpuclk[cpu].clk_name = clk_name;
--
2.27.0
next prev parent reply other threads:[~2021-04-23 11:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-23 6:24 [PATCH 0/4] clk: mvebu: Fix some error handling paths + do some clean-up Christophe JAILLET
2021-04-23 6:25 ` [PATCH 1/4] clk: mvebu: Fix a memory leak in an error handling path Christophe JAILLET
2021-04-23 11:42 ` Walter Harms [this message]
2021-04-23 12:02 ` AW: " Christophe JAILLET
2021-04-23 15:34 ` Walter Harms
2021-04-23 6:25 ` [PATCH 2/4] clk: mvebu: Fix a another " Christophe JAILLET
2021-04-23 6:25 ` [PATCH 3/4] clk: mvebu: Add a missing space Christophe JAILLET
2021-04-23 6:25 ` [PATCH 4/4] clk: mvebu: Remove an unneeded include Christophe JAILLET
2021-04-23 7:27 ` [PATCH 0/4] clk: mvebu: Fix some error handling paths + do some clean-up Thomas Petazzoni
2021-04-23 8:49 ` Christophe JAILLET
2021-05-22 6:51 ` Christophe JAILLET
2021-05-22 7:17 ` Marion & Christophe JAILLET
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=3e38da0e86c045d3aefd46f375e8b48e@bfs.de \
--to=wharms@bfs.de \
--cc=christophe.jaillet@wanadoo.fr \
--cc=gregory.clement@bootlin.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@kernel.org \
--cc=thomas.petazzoni@free-electrons.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).