From patchwork Tue Sep 29 10:59:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 291222 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=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT 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 DB647C4727C for ; Tue, 29 Sep 2020 11:08:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9C1B721D7D for ; Tue, 29 Sep 2020 11:08:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601377731; bh=7zJWWQyG8dVvuschc73v5T/A+sdPSkOOQKs8l8Al4rQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VMjhhnZVbrAZl0yNGOX6sRwZ41vLTYgaSGHIt+RB/BHusQzp+YFE0g8k0bqo6auAo qhL93Wokqrm2mTOifCuXMr2dmj+7tNg28AoLSitEkDUMQ+vUthfcl3lpN6Yt1mu2+V KyZwdwxp0fvCplxZf31/Qeh7//5rK1jF2TExV/X4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728728AbgI2LIs (ORCPT ); Tue, 29 Sep 2020 07:08:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:47710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728996AbgI2LIh (ORCPT ); Tue, 29 Sep 2020 07:08:37 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6CE1821D46; Tue, 29 Sep 2020 11:08:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601377717; bh=7zJWWQyG8dVvuschc73v5T/A+sdPSkOOQKs8l8Al4rQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=swp2vqfTky104mi71Mk52Qb2/rfzFJrGKkyetiRorn8qIEILHAql+GyoeYzJTgjOJ bnL7EIDodHZcYlXO45OOf7jIustrQENwojaMH9aH67pH8Rnv76q3Qrv88jC+ecDnK3 K1/0kzdAwlSUtl3Mdq6AkJfmc9HdL8jQqsbCoufU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stephen Kitt , Tony Lindgren , Stephen Boyd , Sasha Levin Subject: [PATCH 4.9 020/121] clk/ti/adpll: allocate room for terminating null Date: Tue, 29 Sep 2020 12:59:24 +0200 Message-Id: <20200929105931.183115553@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200929105930.172747117@linuxfoundation.org> References: <20200929105930.172747117@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stephen Kitt [ Upstream commit 7f6ac72946b88b89ee44c1c527aa8591ac5ffcbe ] 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 Link: https://lkml.kernel.org/r/20191019140634.15596-1-steve@sk2.org Acked-by: Tony Lindgren Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- 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 255cafb18336a..9345eaf00938e 100644 --- a/drivers/clk/ti/adpll.c +++ b/drivers/clk/ti/adpll.c @@ -193,15 +193,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;