From patchwork Fri Mar 15 11:47:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 13593379 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CED83C54E58 for ; Fri, 15 Mar 2024 11:50:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Date:Message-Id:MIME-Version:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ISdDLJP20PO3m/CLveM24fbTcgMXG2SGokcgiRWlgB8=; b=qTngcYG4dI8MdC 9ugc/VcI8o4bX8y9slTdsL7sDF3BadWa9UhLvD6mLi8KNc5jJ3QAU9OLssCWO/Mw6Z7MnHvsQ6pYa 9xxaJeffI0K4A70R1PzBjOaqOCtJ/1vIJuIkmrcZ9xDoMDCgZJrp+C3JFGNUY4vsxjsizGVhl8TgK nU94EJRNM3Cn7pP1ezD/ZFDTmQk25Oi/EC5mAuymW2MNiuf4bCejjc/uNlvbdpePnWnENoyOFcwaw IDKzd5ceLQRFzpxHYpKaWAO8u4HARNu1pWr/P72IemCf8cuYxFo8RxPrOVP71rUOvjYRM6+/0fx4T GubRsSg/ARFZsLSoNwsw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rl64i-000000005qQ-1RAv; Fri, 15 Mar 2024 11:50:12 +0000 Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:32c8:5054:ff:fe00:142]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rl64f-000000005IX-2XB4 for linux-arm-kernel@lists.infradead.org; Fri, 15 Mar 2024 11:50:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:Reply-To:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=q6iaqWZ35Ho9QJO468pOuORhmj0rHw6LUzE5ftm3Q4g=; b=j08CrM8fgkMUvrGYz5jDV900Q6 GFVjLAW982+ssaEOWfr98hnHdUKhY74wXL93ssxMZRIdJm8W1ypa+SiaYsPM7eR0ZI0LfWJE3wkqP 1v1J6RJ9JKlvw3Wop2zZ5OcxIO7aXAfKTswOq0fOOKXHtD/OAS+rGIl3rgbxmO/r8J/TJPvJQnoYt 5FcVse0+CMeOQHQOHe+wxmPI0IePH4QKu8gY2xqT8w8TaGQLqXPn+QrSAjqLTDZOAafBgrST0IUiL 9G4fZIEBEFEuvQV26QoiDq472ENVRQ0xj1IAv39KpLcGTfpNKGmMsWqB7BRJs5znDehykmNIjQIGP bDsSwB1g==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:50004 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rl62V-0001Zu-2g; Fri, 15 Mar 2024 11:47:55 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1rl62V-004UFh-Te; Fri, 15 Mar 2024 11:47:55 +0000 From: "Russell King (Oracle)" To: linux-arm-kernel@lists.infradead.org Cc: Duanqiang Wen , mturquette@baylibre.com, sboyd@kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] clkdev: report over-sized strings when creating clkdev entries MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Fri, 15 Mar 2024 11:47:55 +0000 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240315_045009_741893_6EC5D356 X-CRM114-Status: GOOD ( 11.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Report an error when an attempt to register a clkdev entry results in a truncated string so the problem can be easily spotted. Reported by: Duanqiang Wen Signed-off-by: Russell King (Oracle) Reviewed-by: Stephen Boyd --- drivers/clk/clkdev.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index ee37d0be6877..3146f26ab997 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -158,6 +158,10 @@ vclkdev_alloc(struct clk_hw *hw, const char *con_id, const char *dev_fmt, va_list ap) { struct clk_lookup_alloc *cla; + struct va_format fmt; + const char *failure; + size_t max_size; + ssize_t res; cla = kzalloc(sizeof(*cla), GFP_KERNEL); if (!cla) @@ -165,16 +169,34 @@ vclkdev_alloc(struct clk_hw *hw, const char *con_id, const char *dev_fmt, cla->cl.clk_hw = hw; if (con_id) { - strscpy(cla->con_id, con_id, sizeof(cla->con_id)); + res = strscpy(cla->con_id, con_id, sizeof(cla->con_id)); + if (res < 0) { + max_size = sizeof(cla->con_id); + failure = "connection"; + goto fail; + } cla->cl.con_id = cla->con_id; } if (dev_fmt) { - vscnprintf(cla->dev_id, sizeof(cla->dev_id), dev_fmt, ap); + res = vsnprintf(cla->dev_id, sizeof(cla->dev_id), dev_fmt, ap); + if (res >= sizeof(cla->dev_id)) { + max_size = sizeof(cla->dev_id); + failure = "device"; + goto fail; + } cla->cl.dev_id = cla->dev_id; } return &cla->cl; + +fail: + fmt.fmt = dev_fmt; + fmt.va = ≈ + pr_err("%pV:%s: %s ID is greater than %zu\n", + &fmt, con_id, failure, max_size); + kfree(cla); + return NULL; } static struct clk_lookup *