spmi: pmic-arb: fix return path in for_each_available_child_of_node()

commit 77adf4b1f3e1fdb319f7ee515e5924bb77df3916 upstream.

This loop requires explicit calls to of_node_put() upon early exits
(break, goto, return) to decrement the child refcounter and avoid memory
leaks if the child is not required out of the loop.

A more robust solution is using the scoped variant of the macro, which
automatically calls of_node_put() when the child goes out of scope.

Cc: stable@vger.kernel.org
Fixes: 979987371739 ("spmi: pmic-arb: Add multi bus support")
Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Link: https://lore.kernel.org/r/20241001-spmi-pmic-arb-scoped-v1-1-5872bab34ed6@gmail.com
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Link: https://lore.kernel.org/r/20241109002829.160973-2-sboyd@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c
index 9ba9495fcc4bae401fa054f7da244d35f1c120ca..ea843159b745d5d0f27cc4629533c0d76df1e3f7 100644 (file)
--- a/drivers/spmi/spmi-pmic-arb.c
+++ b/drivers/spmi/spmi-pmic-arb.c
@@ -1763,14 +1763,13 @@ static int spmi_pmic_arb_register_buses(struct spmi_pmic_arb *pmic_arb,
 {
        struct device *dev = &pdev->dev;
        struct device_node *node = dev->of_node;
-       struct device_node *child;
        int ret;
 
        /* legacy mode doesn't provide child node for the bus */
        if (of_device_is_compatible(node, "qcom,spmi-pmic-arb"))
                return spmi_pmic_arb_bus_init(pdev, node, pmic_arb);
 
-       for_each_available_child_of_node(node, child) {
+       for_each_available_child_of_node_scoped(node, child) {
                if (of_node_name_eq(child, "spmi")) {
                        ret = spmi_pmic_arb_bus_init(pdev, child, pmic_arb);
                        if (ret)