tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit dddca3b2fc676113c58b04aaefe84bfb958ac83e ]

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: 1c8fa58f47 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Joe Hattori
2025-01-04 17:04:53 +09:00
committed by Greg Kroah-Hartman
parent 210eb21986
commit 5078123528
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/regulator/of_regulator.c
+13 -1
View File
@@ -446,7 +446,7 @@ int of_regulator_match(struct device *dev, struct device_node *node,
"failed to parse DT for regulator %pOFn\n", "failed to parse DT for regulator %pOFn\n",
child); child);
of_node_put(child); of_node_put(child);
return -EINVAL; goto err_put;
} }
match->of_node = of_node_get(child); match->of_node = of_node_get(child);
count++; count++;
@@ -455,6 +455,18 @@ int of_regulator_match(struct device *dev, struct device_node *node,
} }
return count; 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); EXPORT_SYMBOL_GPL(of_regulator_match);