arm/mach-omap2: Fix refcount leak bugs
Subsystems (4)
PATCH v2 1/1 arm/mach-omap2: Fix refcount leak bugs
We need to add of_node_put() to keep refcount balance for of_find_xxx() which will return a node pointer with refcount incremented.
---
changelog:
v2:(1) we find several new leak bugs
(2) we merge all mach-omap2 related bugs in to one commit
v1: we send a patch for each missing of_node_put bug
arch/arm/mach-omap2/display.c | 1 + arch/arm/mach-omap2/omap4-common.c | 1 + arch/arm/mach-omap2/omap_hwmod.c | 6 ++++++ arch/arm/mach-omap2/pdata-quirks.c | 2 ++ 4 files changed, 10 insertions(+)
arch/arm/mach-omap2/display.c +1 -0
@@ -211,6 +211,7 @@ static int __init omapdss_init_fbdev(void) node =of_find_node_by_name (NULL ,"omap4_padconf_global" );if (node) omap4_dsi_mux_syscon =syscon_node_to_regmap (node); +of_node_put (node);return 0 ; }
arch/arm/mach-omap2/omap4-common.c +1 -0
@@ -135,6 +135,7 @@ static int __init omap4_sram_init(void)pr_warn ("%s:Unable to allocate sram needed to handle errata I688\n" , __func__); sram_pool =of_gen_pool_get (np,"sram" ,0 ); +of_node_put (np);if (!sram_pool)pr_warn ("%s:Unable to get sram pool needed to handle errata I688\n" , __func__);
arch/arm/mach-omap2/omap_hwmod.c +6 -0
@@ -2365,6 +2365,7 @@ static int __init _init(struct omap_hwmod *oh, void *data) r =_init_mpu_rt_base (oh,NULL , index, np);if (r <0 ) { +of_node_put (bus);WARN (1 ,"omap_hwmod: %s: doesn't have mpu register target base\n" , oh->name);return 0 ;
@@ -2372,6 +2373,7 @@ static int __init _init(struct omap_hwmod *oh, void *data) r =_init_clocks (oh, np);if (r <0 ) { +of_node_put (bus);WARN (1 ,"omap_hwmod: %s: couldn't init clocks\n" , oh->name);return -EINVAL ; }
@@ -2385,6 +2387,8 @@ static int __init _init(struct omap_hwmod *oh, void *data)parse_module_flags (oh, child); } +of_node_put (bus); + oh->_state = _HWMOD_STATE_INITIALIZED;return 0 ;
@@ -3648,6 +3652,7 @@ static void __init omap_hwmod_setup_earlycon_flags(void) np =of_find_node_by_path ("/chosen" );if (np) { uart =of_get_property (np,"stdout-path" ,NULL ); +of_node_put (np);if (uart) { np =of_find_node_by_path (uart);if (np) {
@@ -3661,6 +3666,7 @@ static void __init omap_hwmod_setup_earlycon_flags(void) }if (oh) oh->flags |=DEBUG_OMAPUART_FLAGS ; +of_node_put (np); } } }
arch/arm/mach-omap2/pdata-quirks.c +2 -0
@@ -540,6 +540,8 @@ pdata_quirks_init_clocks(const struct of_device_id *omap_dt_match_table)of_platform_populate (np, omap_dt_match_table, omap_auxdata_lookup,NULL ); + +of_node_put (np); } }
Signature · 1 line
2.25.1
Quoted 14 lines · Liang He
We need to add
of_node_put()to keep refcount balance forof_find_xxx()which will return a node pointer with refcount incremented.Signed-off-by Liang He <[email protected]>---
changelog:v2:(1) we find several new leak bugs
(2) we merge all mach-omap2 related bugs in to one commitv1: we send a patch for each missing
of_node_putbug
Quoted 5 lines
arch/arm/mach-omap2/display.c | 1 + arch/arm/mach-omap2/omap4-common.c | 1 + arch/arm/mach-omap2/omap_hwmod.c | 6 ++++++ arch/arm/mach-omap2/pdata-quirks.c | 2 ++ 4 files changed, 10 insertions(+)
Before applying the patch please check it carefully. Previous evidence
[1] suggests that not it was not even compiled.
[1] https://lore.kernel.org/all/[email protected]/
Best regards,
Krzysztof
Tony Lindgren
maintainerarch/arm/mach-omap2/omap4-common.c static int __init omap4_sram_init(void) · line 141
Quoted 10 lines · Liang He
arch/arm/mach-omap2/omap4-common.c +1
-0@@ -135,6 +135,7 @@ static int __init omap4_sram_init(void)pr_warn ("%s:Unable to allocate sram needed to handle errata I688\n" , __func__); sram_pool =of_gen_pool_get (np,"sram" ,0 ); +of_node_put (np);if (!sram_pool)pr_warn ("%s:Unable to get sram pool needed to handle errata I688\n" , __func__);
Here sram_pool is used after of_node_put() on it. Don't we want to do the put only after no users?
Regards,
Tony