From: Tony Lindgren <tony@atomide.com>
To: Maninder Singh <maninder1.s@samsung.com>
Cc: bcousson@baylibre.com, paul@pwsan.com, linux@armlinux.org.uk,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, pankaj.m@samsung.com,
ajeet.y@samsung.com, Vaneet Narang <v.narang@samsung.com>
Subject: Re: [PATCH v3] mach-omap2: fixing wrong strcat for Non-NULL terminated string
Date: Tue, 6 Dec 2016 09:08:00 -0800 [thread overview]
Message-ID: <20161206170800.GB13181@atomide.com> (raw)
In-Reply-To: <1480915633-16284-1-git-send-email-maninder1.s@samsung.com>
* Maninder Singh <maninder1.s@samsung.com> [161204 21:32]:
> 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>
> Signed-off-by: Russell King <linux@armlinux.org.uk>
I think the above should have been just:
Cc: Russell King <linux@armlinux.org.uk>
Can you please check and resend with Russell in Cc?
Regards,
Tony
> ---
> v1 -> v2: changed strncpy to strlcpy
> v2 -> v3: use of strlcat as suggested by Russell to
> make change clearer and simpler.
>
> arch/arm/mach-omap2/omap_hwmod.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
> index 759e1d4..e8b9887 100644
> --- a/arch/arm/mach-omap2/omap_hwmod.c
> +++ b/arch/arm/mach-omap2/omap_hwmod.c
> @@ -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)) {
> --
> 1.9.1
>
next prev parent reply other threads:[~2016-12-06 17:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-05 5:27 [PATCH v3] mach-omap2: fixing wrong strcat for Non-NULL terminated string Maninder Singh
2016-12-06 17:08 ` Tony Lindgren [this message]
2016-12-08 4:10 Maninder Singh
2016-12-27 17:40 ` Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161206170800.GB13181@atomide.com \
--to=tony@atomide.com \
--cc=ajeet.y@samsung.com \
--cc=bcousson@baylibre.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=maninder1.s@samsung.com \
--cc=pankaj.m@samsung.com \
--cc=paul@pwsan.com \
--cc=v.narang@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).