kevin/linux
1
Fork 0
Code

clkdev: don't fail clkdev_alloc() if over-sized

Browse Source 
Don't fail clkdev_alloc() if the strings are over-sized. In this case,
the entry will not match during lookup, so its useless. However, since
code fails if we return NULL leading to boot failure, return a dummy
entry with the connection and device IDs set to "bad".

Leave the warning so these problems can be found, and the useless
wasteful clkdev registrations removed.

Reported-by: Ron Economos <re@w6rz.net>
Reported-by: Guenter Roeck <linux@roeck-us.net>
Fixes: 8d532528ff ("clkdev: report over-sized strings when creating clkdev entries")
Closes: https://lore.kernel.org/linux-clk/7eda7621-0dde-4153-89e4-172e4c095d01@roeck-us.net.
Link: https://lore.kernel.org/r/28114882-f8d7-21bf-4536-a186e8d7a22a@w6rz.net
Tested-by: Ron Economos <re@w6rz.net>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
This commit is contained in:
Russell King (Oracle) 2024-05-27 09:00:06 +01:00
parent 8d532528ff
commit 616501eccb
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/clk/clkdev.c
View File

@ -204,8 +204,15 @@ fail:
pr_err("%pV:%s: %s ID is greater than %zu\n", pr_err("%pV:%s: %s ID is greater than %zu\n",
&vaf, con_id, failure, max_size); &vaf, con_id, failure, max_size);
va_end(ap_copy); va_end(ap_copy);
kfree(cla);
return NULL; /*
* Don't fail in this case, but as the entry won't ever match just
* fill it with something that also won't match.
*/
strscpy(cla->con_id, "bad", sizeof(cla->con_id));
strscpy(cla->dev_id, "bad", sizeof(cla->dev_id));
return &cla->cl;
} }
static struct clk_lookup * static struct clk_lookup *