ARM: omap2+: fixing wrong strcat for Non-NULL terminated string (5066d529) · Commits · 戴 / test

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>

arch/arm/mach-omap2/omap_hwmod.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -741,14 +741,14 @@ static int _init_main_clk(struct omap_hwmod *oh)
		int ret = 0;
		char name[MOD_CLK_MAX_NAME_LEN];
		struct clk *clk;
		static const char modck[] = "_mod_ck";

		/* +7 magic comes from '_mod_ck' suffix */
		if (strlen(oh->name) + 7 > MOD_CLK_MAX_NAME_LEN)
		if (strlen(oh->name) >= MOD_CLK_MAX_NAME_LEN - strlen(modck))
		pr_warn("%s: warning: cropping name for %s\n", __func__,
		oh->name);

		strncpy(name, oh->name, MOD_CLK_MAX_NAME_LEN - 7);
		strcat(name, "_mod_ck");
		strlcpy(name, oh->name, MOD_CLK_MAX_NAME_LEN - strlen(modck));
		strlcat(name, modck, MOD_CLK_MAX_NAME_LEN);

		clk = clk_get(NULL, name);
		if (!IS_ERR(clk)) {

Admin message