From: Stephen Kitt <steve@sk2.org>
To: Stephen Boyd <sboyd@kernel.org>
Cc: Michael Turquette <mturquette@baylibre.com>,
Tero Kristo <t-kristo@ti.com>, Tony Lindgren <tony@atomide.com>,
linux-clk@vger.kernel.org, linux-omap@vger.kernel.org,
linux-kernel@vger.kernel.org, Stephen Kitt <steve@sk2.org>
Subject: [PATCH v3] clk/ti/adpll: allocate room for terminating null
Date: Sat, 19 Oct 2019 16:06:34 +0200 [thread overview]
Message-ID: <20191019140634.15596-1-steve@sk2.org> (raw)
In-Reply-To: <20191019155441.2b1b349f@heffalump.sk2.org>
The buffer allocated in ti_adpll_clk_get_name doesn't account for the
terminating null. This patch switches to devm_kasprintf to avoid
overflowing.
Signed-off-by: Stephen Kitt <steve@sk2.org>
---
Changes since v2:
- Move "adpll" into the format string and drop base_name entirely.
Changes since v1:
- Use devm_kasprintf instead of manually allocating the target
buffer.
---
drivers/clk/ti/adpll.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/clk/ti/adpll.c b/drivers/clk/ti/adpll.c
index fdfb90058504..bb2f2836dab2 100644
--- a/drivers/clk/ti/adpll.c
+++ b/drivers/clk/ti/adpll.c
@@ -194,15 +194,8 @@ static const char *ti_adpll_clk_get_name(struct ti_adpll_data *d,
if (err)
return NULL;
} else {
- const char *base_name = "adpll";
- char *buf;
-
- buf = devm_kzalloc(d->dev, 8 + 1 + strlen(base_name) + 1 +
- strlen(postfix), GFP_KERNEL);
- if (!buf)
- return NULL;
- sprintf(buf, "%08lx.%s.%s", d->pa, base_name, postfix);
- name = buf;
+ name = devm_kasprintf(d->dev, GFP_KERNEL, "%08lx.adpll.%s",
+ d->pa, postfix);
}
return name;
--
2.20.1
next prev parent reply other threads:[~2019-10-19 14:23 UTC|newest]
Thread overview: 12+ 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
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-19 13:54 ` Stephen Kitt
2019-10-19 14:06 ` Stephen Kitt [this message]
2019-10-21 14:31 ` [PATCH v3] " Tony Lindgren
2019-11-08 17:00 ` Stephen Boyd
2019-11-08 20:17 ` Stephen Kitt
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=20191019140634.15596-1-steve@sk2.org \
--to=steve@sk2.org \
--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=t-kristo@ti.com \
--cc=tony@atomide.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).