diff options
| author | Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp> | 2025-01-07 14:44:53 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-02-08 09:57:10 +0100 |
| commit | 3d62a5037f3e731a547392545ef39a0a258ae564 (patch) | |
| tree | fbc0225ae63b0aee3ef7c4f7a320abf81789eb97 | |
| parent | 92cff996624c4757d5bbace3dfa3f1567ba94143 (diff) | |
OPP: OF: Fix an OF node leak in _opp_add_static_v2()
[ Upstream commit 1d38eb7f7b26261a0b642f6e0923269c7c000a97 ]
_opp_add_static_v2() leaks the obtained OF node reference when
_of_opp_alloc_required_opps() fails. Add an of_node_put() call in the
error path.
Fixes: 3466ea2cd6b6 ("OPP: Don't drop opp->np reference while it is still in use")
Signed-off-by: Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/opp/of.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/opp/of.c b/drivers/opp/of.c index 55c8cfef97d4..dcab0e7ace10 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -959,7 +959,7 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table, ret = _of_opp_alloc_required_opps(opp_table, new_opp); if (ret) - goto free_opp; + goto put_node; if (!of_property_read_u32(np, "clock-latency-ns", &val)) new_opp->clock_latency_ns = val; @@ -1009,6 +1009,8 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table, free_required_opps: _of_opp_free_required_opps(opp_table, new_opp); +put_node: + of_node_put(np); free_opp: _opp_free(new_opp); |