[PATCH 1/1] mach-omap2: fixing wrong strcat for Non-NULL terminated string
From: linux@armlinux.org.uk (Russell King - ARM Linux)
Date: 2016-11-30 13:27:59
Also in:
linux-omap, lkml
On Wed, Nov 30, 2016 at 04:10:28PM +0530, Maninder Singh wrote:
variable name can have Non NULL terminated string after cropping which may result strcat to fail, and cropping is not required if (strlen(oh->name) + 8 < MOD_CLK_MAX_NAME_LEN). Issue caught with static analysis tool: "Dangerous usage of 'name' (strncpy doesn't always 0-terminate it)"
Maybe switch to strlcpy() ?
quoted hunk ↗ jump to hunk
Signed-off-by: Vaneet Narang <redacted> Signed-off-by: Maninder Singh <redacted> --- arch/arm/mach-omap2/omap_hwmod.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 759e1d4..8adf272 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c@@ -742,12 +742,15 @@ static int _init_main_clk(struct omap_hwmod *oh) char name[MOD_CLK_MAX_NAME_LEN]; struct clk *clk; - /* +7 magic comes from '_mod_ck' suffix */ - if (strlen(oh->name) + 7 > MOD_CLK_MAX_NAME_LEN) + /* +8 magic comes from strlen("_mod_ck") added as suffix */ + if (strlen(oh->name) + 8 > MOD_CLK_MAX_NAME_LEN) { pr_warn("%s: warning: cropping name for %s\n", __func__, oh->name); + strncpy(name, oh->name, MOD_CLK_MAX_NAME_LEN - 8); + name[MOD_CLK_MAX_NAME_LEN - 8] = '\0'; + } else + strcpy(name, oh->name); - strncpy(name, oh->name, MOD_CLK_MAX_NAME_LEN - 7); strcat(name, "_mod_ck"); clk = clk_get(NULL, name);-- 1.9.1
-- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net.