]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
clk: bcm: rpi: Add NULL check in raspberrypi_clk_register()
authorHenry Martin <bsdhenrymartin@gmail.com>
Wed, 2 Apr 2025 02:05:13 +0000 (10:05 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:04:03 +0000 (11:04 +0100)
[ Upstream commit 73c46d9a93d071ca69858dea3f569111b03e549e ]

devm_kasprintf() returns NULL when memory allocation fails. Currently,
raspberrypi_clk_register() does not check for this case, which results
in a NULL pointer dereference.

Add NULL check after devm_kasprintf() to prevent this issue.

Fixes: 93d2725affd6 ("clk: bcm: rpi: Discover the firmware clocks")
Signed-off-by: Henry Martin <bsdhenrymartin@gmail.com>
Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://lore.kernel.org/r/20250402020513.42628-1-bsdhenrymartin@gmail.com
Reviewed-by: Stefan Wahren <wahrenst@gmx.net>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/clk/bcm/clk-raspberrypi.c

index 969227e2df215a10c8b22cc83d8c8e9927bb342a..f6e7ff6e9d7cc8621d875c8fff6f93468870b1d3 100644 (file)
@@ -199,6 +199,8 @@ static struct clk_hw *raspberrypi_clk_register(struct raspberrypi_clk *rpi,
        init.name = devm_kasprintf(rpi->dev, GFP_KERNEL,
                                   "fw-clk-%s",
                                   rpi_firmware_clk_names[id]);
+       if (!init.name)
+               return ERR_PTR(-ENOMEM);
        init.ops = &raspberrypi_firmware_clk_ops;
        init.flags = CLK_GET_RATE_NOCACHE;