]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
reset: k210: fix OF node leak in probe() error path
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Sun, 25 Aug 2024 14:14:25 +0000 (16:14 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 Oct 2024 14:32:36 +0000 (16:32 +0200)
[ Upstream commit b14e40f5dc7cd0dd7e958010e6ca9ad32ff2ddad ]

Driver is leaking OF node reference on memory allocation failure.
Acquire the OF node reference after memory allocation to fix this and
keep it simple.

Fixes: 5a2308da9f60 ("riscv: Add Canaan Kendryte K210 reset controller")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20240825-reset-cleanup-scoped-v1-2-03f6d834f8c0@linaro.org
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/reset/reset-k210.c

index b62a2fd44e4e42fe54a34b56688f1ea908eb8dd7..e77e4cca377dca3331390e9d8f137f4fcd77d176 100644 (file)
@@ -90,7 +90,7 @@ static const struct reset_control_ops k210_rst_ops = {
 static int k210_rst_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
-       struct device_node *parent_np = of_get_parent(dev->of_node);
+       struct device_node *parent_np;
        struct k210_rst *ksr;
 
        dev_info(dev, "K210 reset controller\n");
@@ -99,6 +99,7 @@ static int k210_rst_probe(struct platform_device *pdev)
        if (!ksr)
                return -ENOMEM;
 
+       parent_np = of_get_parent(dev->of_node);
        ksr->map = syscon_node_to_regmap(parent_np);
        of_node_put(parent_np);
        if (IS_ERR(ksr->map))