From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9803CA9EB0 for ; Mon, 21 Oct 2019 14:31:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C9EC820656 for ; Mon, 21 Oct 2019 14:31:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729150AbfJUObO (ORCPT ); Mon, 21 Oct 2019 10:31:14 -0400 Received: from muru.com ([72.249.23.125]:38392 "EHLO muru.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726977AbfJUObO (ORCPT ); Mon, 21 Oct 2019 10:31:14 -0400 Received: from atomide.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTPS id 2A172810A; Mon, 21 Oct 2019 14:31:48 +0000 (UTC) Date: Mon, 21 Oct 2019 07:31:10 -0700 From: Tony Lindgren To: Stephen Kitt Cc: Stephen Boyd , Michael Turquette , Tero Kristo , linux-clk@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3] clk/ti/adpll: allocate room for terminating null Message-ID: <20191021143110.GT5610@atomide.com> References: <20191019155441.2b1b349f@heffalump.sk2.org> <20191019140634.15596-1-steve@sk2.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191019140634.15596-1-steve@sk2.org> User-Agent: Mutt/1.12.1 (2019-06-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Stephen Kitt [191019 14:07]: > 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 > --- > 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. Acked-by: Tony Lindgren > --- > 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 >