Received-SPF: pass (google.com: domain of linux-kernel+bounces-191918-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
In-Reply-To: <28114882-f8d7-21bf-4536-a186e8d7a22a@w6rz.net>
References: <28114882-f8d7-21bf-4536-a186e8d7a22a@w6rz.net>
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
To: linux-clk@vger.kernel.org
Cc: Stephen Boyd <sboyd@kernel.org>,
	 Ron Economos <re@w6rz.net>,
	 Samuel Holland <samuel.holland@sifive.com>,
	 Guenter Roeck <linux@roeck-us.net>,
	 AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>,
	 Dinh Nguyen <dinguyen@kernel.org>,
	 Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
	 Michael Turquette <mturquette@baylibre.com>,
	 Paul Walmsley <paul.walmsley@sifive.com>,
	 Rob Herring <robh@kernel.org>,
	 Yang Li <yang.lee@linux.alibaba.com>,
	 linux-kernel@vger.kernel.org,
	 linux-riscv@lists.infradead.org,
	 linux-arm-kernel@lists.infradead.org,
	 regressions@lists.linux.dev
Subject: [PATCH] clk: clkdev: don't fail clkdev_alloc() if over-sized
Precedence: bulk
MIME-Version: 1.0
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="utf-8"
Message-Id: <E1sBrzn-00E8GK-Ue@rmk-PC.armlinux.org.uk>
Sender: Russell King <rmk@armlinux.org.uk>
Date: Tue, 28 May 2024 09:15:47 +0100

Don't fail clkdev_alloc() if the strings are over-sized. In this case,
the entry will not match during lookup, so its useless. However, since
code fails if we return NULL leading to boot failure, return a dummy
entry with the connection and device IDs set to "bad".

Leave the warning so these problems can be found, and the useless
wasteful clkdev registrations removed.

Fixes: 8d532528ff6a ("clkdev: report over-sized strings when creating clkdev entries")
Closes: https://lore.kernel.org/linux-clk/7eda7621-0dde-4153-89e4-172e4c095d01@roeck-us.net.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---

Please try this patch, which should allow the platform to boot, bit will
intentionally issue lots of warnings. There is a separate patch posted
recently that removes the useless registration with clkdev.

 drivers/clk/clkdev.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index 6a77d7e201a9..2f83fb97c6fb 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -204,8 +204,15 @@ vclkdev_alloc(struct clk_hw *hw, const char *con_id, const char *dev_fmt,
 	pr_err("%pV:%s: %s ID is greater than %zu\n",
 	       &vaf, con_id, failure, max_size);
 	va_end(ap_copy);
-	kfree(cla);
-	return NULL;
+
+	/*
+	 * Don't fail in this case, but as the entry won't ever match just
+	 * fill it with something that also won't match.
+	 */
+	strscpy(cla->con_id, "bad", sizeof(cla->con_id));
+	strscpy(cla->dev_id, "bad", sizeof(cla->dev_id));
+
+	return &cla->cl;
 }
 
 static struct clk_lookup *
-- 
2.30.2