]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
OPP: OF: Fix an OF node leak in _opp_add_static_v2()
authorJoe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
Tue, 7 Jan 2025 05:44:53 +0000 (14:44 +0900)
committerViresh Kumar <viresh.kumar@linaro.org>
Tue, 7 Jan 2025 06:07:52 +0000 (11:37 +0530)
_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>
drivers/opp/of.c

index fd5ed285825881a12a126776f290bef80459b7d5..a24f76f5fd0172fc3f9603e57e7124d33074725d 100644 (file)
@@ -926,7 +926,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;
@@ -976,6 +976,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);