p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ARM: omap2+: fixing wrong strcat for Non-NULL terminated string 

Issue caught with static analysis tool:
"Dangerous usage of 'name' (strncpy doesn't always 0-terminate it)"

Use strlcpy _includes_ the NUL terminator, and  strlcat() which ensures
that it won't overflow the buffer.

Reported-by: Maninder Singh <maninder1.s@samsung.com>
Signed-off-by: Vaneet Narang <v.narang@samsung.com>
CC: Russell King <linux@armlinux.org.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Maninder Singh 2016-12-08 09:40:30 +05:30 committed by Tony Lindgren
parent f86a2c875f
commit 5066d5296f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-omap2/omap_hwmod.c
View File

@ -741,14 +741,14 @@ static int _init_main_clk(struct omap_hwmod *oh)
int ret = 0; int ret = 0;
char name[MOD_CLK_MAX_NAME_LEN]; char name[MOD_CLK_MAX_NAME_LEN];
struct clk *clk; struct clk *clk;
static const char modck[] = "_mod_ck";
/* +7 magic comes from '_mod_ck' suffix */ if (strlen(oh->name) >= MOD_CLK_MAX_NAME_LEN - strlen(modck))
if (strlen(oh->name) + 7 > MOD_CLK_MAX_NAME_LEN)
pr_warn("%s: warning: cropping name for %s\n", __func__, pr_warn("%s: warning: cropping name for %s\n", __func__,
oh->name); oh->name);
strncpy(name, oh->name, MOD_CLK_MAX_NAME_LEN - 7); strlcpy(name, oh->name, MOD_CLK_MAX_NAME_LEN - strlen(modck));
strcat(name, "_mod_ck"); strlcat(name, modck, MOD_CLK_MAX_NAME_LEN);
clk = clk_get(NULL, name); clk = clk_get(NULL, name);
if (!IS_ERR(clk)) { if (!IS_ERR(clk)) {