archives/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-03-08 03:04:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: omap2: Fix reference count leaks in omap_control_init()

Browse source 
The of_get_child_by_name() function increments the reference count
of child nodes, causing multiple reference leaks in omap_control_init():

1. scm_conf node never released in normal/error paths
2. clocks node leak when checking existence
3. Missing scm_conf release before np in error paths

Fix these leaks by adding proper of_node_put() calls and separate error
handling.

Fixes: e5b635742e ("ARM: OMAP2+: control: add syscon support for register accesses")
Cc: stable@vger.kernel.org
Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
Reviewed-by: Andreas Kemnade <andreas@kemnade.info>
Link: https://patch.msgid.link/20251217142122.1861292-1-vulab@iscas.ac.cn
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
This commit is contained in:
Wentao Liang 2025-12-17 14:21:22 +00:00 • committed by Kevin Hilman
parent 8f0b4cce44
commit 93a04ab480
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
arch/arm/mach-omap2/control.c
View file

@ -732,7 +732,7 @@ int __init omap2_control_base_init(void)
*/
int __init omap_control_init(void)
{
struct device_node *np, *scm_conf;
struct device_node *np, *scm_conf, *clocks_node;
const struct of_device_id *match;
const struct omap_prcm_init_data *data;
int ret;
@ -753,16 +753,19 @@ int __init omap_control_init(void)
if (IS_ERR(syscon)) {
ret = PTR_ERR(syscon);
goto of_node_put;
goto err_put_scm_conf;
}
if (of_get_child_by_name(scm_conf, "clocks")) {
clocks_node = of_get_child_by_name(scm_conf, "clocks");
if (clocks_node) {
of_node_put(clocks_node);
ret = omap2_clk_provider_init(scm_conf,
data->index,
syscon, NULL);
if (ret)
goto of_node_put;
goto err_put_scm_conf;
}
of_node_put(scm_conf);
} else {
/* No scm_conf found, direct access */
ret = omap2_clk_provider_init(np, data->index, NULL,
@ -780,6 +783,9 @@ int __init omap_control_init(void)
return 0;
err_put_scm_conf:
if (scm_conf)
of_node_put(scm_conf);
of_node_put:
of_node_put(np);
return ret;