regulator: of: Implement the unwind path of of_regulator_match()

of_regulator_match() does not release the OF node reference in the error
path, resulting in an OF node leak. Therefore, call of_node_put() on the
obtained nodes before returning the EINVAL error.

Since it is possible that some drivers call this function and do not
exit on failure, such as s2mps11_pmic_driver, clear the init_data and
of_node in the error path.

This was reported by an experimental verification tool that I am
developing. As I do not have access to actual devices nor the QEMU board
configuration to test drivers that call this function, no runtime test
was able to be performed.

Fixes: 1c8fa58f4750 ("regulator: Add generic DT parsing for regulators")
Signed-off-by: Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
Link: https://patch.msgid.link/20250104080453.2153592-1-joe@pf.is.s.u-tokyo.ac.jp
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 3d85762beda636479f3b3b808602a0be221c0c77..6acbd5f2e7963ddebaa88f8bcb956ecae608b35f 100644 (file)
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -446,7 +446,7 @@ int of_regulator_match(struct device *dev, struct device_node *node,
                                        "failed to parse DT for regulator %pOFn\n",
                                        child);
                                of_node_put(child);
-                               return -EINVAL;
+                               goto err_put;
                        }
                        match->of_node = of_node_get(child);
                        count++;
@@ -455,6 +455,18 @@ int of_regulator_match(struct device *dev, struct device_node *node,
        }
 
        return count;
+
+err_put:
+       for (i = 0; i < num_matches; i++) {
+               struct of_regulator_match *match = &matches[i];
+
+               match->init_data = NULL;
+               if (match->of_node) {
+                       of_node_put(match->of_node);
+                       match->of_node = NULL;
+               }
+       }
+       return -EINVAL;
 }
 EXPORT_SYMBOL_GPL(of_regulator_match);