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

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: aed6f3cadc86 ("reset: berlin: convert to a platform driver")
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-1-03f6d834f8c0@linaro.org
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/reset/reset-berlin.c

index 2537ec05eceefd4bc00ff2f2e0ef10b353df4c08..578fe867080ce02078853491e9e085f0708a12a5 100644 (file)
@@ -68,13 +68,14 @@ static int berlin_reset_xlate(struct reset_controller_dev *rcdev,
 
 static int berlin2_reset_probe(struct platform_device *pdev)
 {
-       struct device_node *parent_np = of_get_parent(pdev->dev.of_node);
+       struct device_node *parent_np;
        struct berlin_reset_priv *priv;
 
        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
 
+       parent_np = of_get_parent(pdev->dev.of_node);
        priv->regmap = syscon_node_to_regmap(parent_np);
        of_node_put(parent_np);
        if (IS_ERR(priv->regmap))