Skip to content

Commit 86d884f

Browse files
geertuclaudiubeznea
authored andcommitted
clk: microchip: mpfs-ccc: Use devm_kasprintf() for allocating formatted strings
In various places, string buffers of a fixed size are allocated, and filled using snprintf() with the same fixed size, which is error-prone. Replace this by calling devm_kasprintf() instead, which always uses the appropriate size. While at it, remove an unneeded intermediate variable, which allows us to drop a cast as a bonus. With the initial behavior it would have been possible to have a device tree with a node address that would make "ccc<node_address>_pll<N>" exceed 18 characters. If that happened, the <N> would be cut off & both pll 0 & 1 would be named identically. If that happens, pll1 would fail to register. Thus, the fixes tag has been added to this commit. Fixes: d39fb17 ("clk: microchip: add PolarFire SoC fabric clock support") Signed-off-by: Geert Uytterhoeven <[email protected]> Reviewed-by: Conor Dooley <[email protected]> Tested-by: Conor Dooley <[email protected]> [claudiu.beznea: added the rationale behind fixes tag] Signed-off-by: Claudiu Beznea <[email protected]> Link: https://lore.kernel.org/r/f904fd28b2087d1463ea65f059924e3b1acc193c.1672764239.git.geert+renesas@glider.be
1 parent 1b929c0 commit 86d884f

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

drivers/clk/microchip/clk-mpfs-ccc.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,11 @@ static int mpfs_ccc_register_outputs(struct device *dev, struct mpfs_ccc_out_hw_
164164

165165
for (unsigned int i = 0; i < num_clks; i++) {
166166
struct mpfs_ccc_out_hw_clock *out_hw = &out_hws[i];
167-
char *name = devm_kzalloc(dev, 23, GFP_KERNEL);
167+
char *name = devm_kasprintf(dev, GFP_KERNEL, "%s_out%u", parent->name, i);
168168

169169
if (!name)
170170
return -ENOMEM;
171171

172-
snprintf(name, 23, "%s_out%u", parent->name, i);
173172
out_hw->divider.hw.init = CLK_HW_INIT_HW(name, &parent->hw, &clk_divider_ops, 0);
174173
out_hw->divider.reg = data->pll_base[i / MPFS_CCC_OUTPUTS_PER_PLL] +
175174
out_hw->reg_offset;
@@ -201,14 +200,13 @@ static int mpfs_ccc_register_plls(struct device *dev, struct mpfs_ccc_pll_hw_clo
201200

202201
for (unsigned int i = 0; i < num_clks; i++) {
203202
struct mpfs_ccc_pll_hw_clock *pll_hw = &pll_hws[i];
204-
char *name = devm_kzalloc(dev, 18, GFP_KERNEL);
205203

206-
if (!name)
204+
pll_hw->name = devm_kasprintf(dev, GFP_KERNEL, "ccc%s_pll%u",
205+
strchrnul(dev->of_node->full_name, '@'), i);
206+
if (!pll_hw->name)
207207
return -ENOMEM;
208208

209209
pll_hw->base = data->pll_base[i];
210-
snprintf(name, 18, "ccc%s_pll%u", strchrnul(dev->of_node->full_name, '@'), i);
211-
pll_hw->name = (const char *)name;
212210
pll_hw->hw.init = CLK_HW_INIT_PARENTS_DATA_FIXED_SIZE(pll_hw->name,
213211
pll_hw->parents,
214212
&mpfs_ccc_pll_ops, 0);

0 commit comments

Comments
 (0)