Commit 9bc64d30 authored by Joe Hattori's avatar Joe Hattori Committed by Wentao Guan
Browse files

OPP: OF: Fix an OF node leak in _opp_add_static_v2() 

stable inclusion
from stable-v6.6.76
commit 7ec98ebb38dc612f4692d1041db072f72da30832
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBW08Q

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7ec98ebb38dc612f4692d1041db072f72da30832



--------------------------------

[ 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: 3466ea2c ("OPP: Don't drop opp->np reference while it is still in use")
Signed-off-by: default avatarJoe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
(cherry picked from commit 7ec98ebb38dc612f4692d1041db072f72da30832)
Signed-off-by: default avatarWentao Guan <guanwentao@uniontech.com>
parent 17586822

drivers/opp/of.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

	if (ret)

		goto free_opp;

		goto put_node;



	if (!of_property_read_u32(np, "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:

	_of_opp_free_required_opps(opp_table, new_opp);

put_node:

	of_node_put(np);

free_opp:

	_opp_free(new_opp);