OPP: OF: Fix an OF node leak in _opp_add_static_v2()
[ Upstream commit1d38eb7f7b] _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:3466ea2cd6("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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
7705d8a7f2
commit
7ec98ebb38
+3
-1
@@ -932,7 +932,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);
|
ret = _of_opp_alloc_required_opps(opp_table, new_opp);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto free_opp;
|
goto put_node;
|
||||||
|
|
||||||
if (!of_property_read_u32(np, "clock-latency-ns", &val))
|
if (!of_property_read_u32(np, "clock-latency-ns", &val))
|
||||||
new_opp->clock_latency_ns = val;
|
new_opp->clock_latency_ns = val;
|
||||||
@@ -982,6 +982,8 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table,
|
|||||||
|
|
||||||
free_required_opps:
|
free_required_opps:
|
||||||
_of_opp_free_required_opps(opp_table, new_opp);
|
_of_opp_free_required_opps(opp_table, new_opp);
|
||||||
|
put_node:
|
||||||
|
of_node_put(np);
|
||||||
free_opp:
|
free_opp:
|
||||||
_opp_free(new_opp);
|
_opp_free(new_opp);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user