diff options
| author |   Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp> | 2025-01-04 17:04:53 +0900 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2025-01-06 13:08:49 +0000 |
| commit | dddca3b2fc676113c58b04aaefe84bfb958ac83e (patch) | |
| tree | 823e4075816871d4f63a47867b88c0affe1e9bee | |
| parent | regulator: tps65219: Remove debugging helper function (diff) | |
| download | wireguard-linux-dddca3b2fc676113c58b04aaefe84bfb958ac83e.tar.xz wireguard-linux-dddca3b2fc676113c58b04aaefe84bfb958ac83e.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/regulator/of_regulator.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c index 3d85762beda6..6acbd5f2e796 100644 --- 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); |