From: Tony Lindgren <tony@atomide.com>
To: Stephen Kitt <steve@sk2.org>
Cc: Tero Kristo <t-kristo@ti.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
linux-omap@vger.kernel.org, linux-clk@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] clk/ti/adpll: allocate room for terminating null
Date: Fri, 27 Sep 2019 08:23:15 -0700 [thread overview]
Message-ID: <20190927152315.GE5610@atomide.com> (raw)
In-Reply-To: <20190927145737.7832-1-steve@sk2.org>
* Stephen Kitt <steve@sk2.org> [190927 15:13]:
> The buffer allocated in ti_adpll_clk_get_name doesn't account for the
> terminating null. This patch adds the extra byte, and switches to
> snprintf to avoid overflowing.
>
> Signed-off-by: Stephen Kitt <steve@sk2.org>
> ---
> drivers/clk/ti/adpll.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/clk/ti/adpll.c b/drivers/clk/ti/adpll.c
> index fdfb90058504..27933c4e8a27 100644
> --- a/drivers/clk/ti/adpll.c
> +++ b/drivers/clk/ti/adpll.c
> @@ -196,12 +196,13 @@ static const char *ti_adpll_clk_get_name(struct ti_adpll_data *d,
> } else {
> const char *base_name = "adpll";
> char *buf;
> + size_t size = 8 + 1 + strlen(base_name) + 1 +
> + strlen(postfix) + 1;
>
> - buf = devm_kzalloc(d->dev, 8 + 1 + strlen(base_name) + 1 +
> - strlen(postfix), GFP_KERNEL);
> + buf = devm_kzalloc(d->dev, size, GFP_KERNEL);
> if (!buf)
> return NULL;
> - sprintf(buf, "%08lx.%s.%s", d->pa, base_name, postfix);
> + snprintf(buf, size, "%08lx.%s.%s", d->pa, base_name, postfix);
> name = buf;
> }
>
Thanks for catching this. Maybe just use devm_kasprintf() here?
Regards,
Tony
next prev parent reply other threads:[~2019-09-27 15:23 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-27 14:57 [PATCH] clk/ti/adpll: allocate room for terminating null Stephen Kitt
2019-09-27 15:23 ` Tony Lindgren [this message]
2019-09-27 18:00 ` Stephen Kitt
2019-09-27 18:05 ` [PATCH v2] " Stephen Kitt
2019-09-27 18:18 ` Stephen Kitt
2019-10-17 15:48 ` Stephen Boyd
2019-10-17 15:48 ` Stephen Boyd
2019-10-19 13:54 ` Stephen Kitt
2019-10-19 14:06 ` [PATCH v3] " Stephen Kitt
2019-10-21 14:31 ` Tony Lindgren
2019-11-08 17:00 ` Stephen Boyd
2019-11-08 17:00 ` Stephen Boyd
2019-11-08 20:17 ` Stephen Kitt
2019-11-08 17:01 ` Stephen Boyd
2019-11-08 17:01 ` Stephen Boyd
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=20190927152315.GE5610@atomide.com \
--to=tony@atomide.com \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@kernel.org \
--cc=steve@sk2.org \
--cc=t-kristo@ti.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.