arm/mach-omap2: Fix refcount leak bug in omap_hwmod.c
Subsystems (4)
PATCH 1/1 arm/mach-omap2: Fix refcount leak bug in omap_hwmod.c
In _init(), of_find_node_by_name() will return a node pointer with refcount incremented. We should use of_node_put() in fail path or when it is not used anymore.
NOTE: As the ref will be passed from 'bus' to 'np' by the xx_lookup(), in normal exit path, we should call of_node_put() at the end use of 'np', not the end use of 'bus'.
--- arch/arm/mach-omap2/omap_hwmod.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/mach-omap2/omap_hwmod.c +4 -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 ;
Signature · 1 line
2.25.1
Quoted 4 lines · Liang He
In
_init(),of_find_node_by_name()will return a node pointer with refcount incremented. We should useof_node_put()in fail path or when it is not used anymore.
Quoted 9 lines
NOTE: As the ref will be passed from 'bus' to 'np' by the
xx_lookup(), in normal exit path, we should callof_node_put()at the end use of 'np', not the end use of 'bus'.Signed-off-by Liang He <[email protected]>--- arch/arm/mach-omap2/omap_hwmod.c | 4 ++++ 1 file changed, 4 insertions(+)
Before applying the patch please check it carefully. Previous evidence [1][2] suggests that not it was not even compiled.
[1] https://lore.kernel.org/all/[email protected]/
[2]
https://lore.kernel.org/all/[email protected]/
Best regards,
Krzysztof
Tony Lindgren
maintainerHi,
Quoted 7 lines · Liang He
In
_init(),of_find_node_by_name()will return a node pointer with refcount incremented. We should useof_node_put()in fail path or when it is not used anymore.NOTE: As the ref will be passed from 'bus' to 'np' by the
xx_lookup(), in normal exit path, we should callof_node_put()at the end use of 'np', not the end use of 'bus'.
Looks correct to me. What about missing of_node_put() for of_get_next_child() also in the _init() function?
Regards,
Tony
Quoted 11 lines · Tony Lindgren
Hi,
Quoted 7 lines · Liang He
In
_init(),of_find_node_by_name()will return a node pointer with refcount incremented. We should useof_node_put()in fail path or when it is not used anymore.NOTE: As the ref will be passed from 'bus' to 'np' by the
xx_lookup(), in normal exit path, we should callof_node_put()at the end use of 'np', not the end use of 'bus'.
Quoted 6 lines
Looks correct to me. What about missing
of_node_put()forof_get_next_child()also in the_init()function?Regards,
Tony
Thanks, Tony.
I have found this bug but not send the patch for of_get_next_child()
as I am collecting other OF function related bugs and I have been told that it is better to collect all similar bugs in same directory, then finally report them.
So I will send a new patch for both of the two missing 'put' bugs caused by of_find_xxx() and of_get_xxx() in omap_hwmod.c
Thanks gain.
Liang
Tony Lindgren
maintainerQuoted 19 lines · Liang He
Quoted 16 lines · Tony Lindgren
Hi,
Quoted 7 lines · Liang He
In
_init(),of_find_node_by_name()will return a node pointer with refcount incremented. We should useof_node_put()in fail path or when it is not used anymore.NOTE: As the ref will be passed from 'bus' to 'np' by the
xx_lookup(), in normal exit path, we should callof_node_put()at the end use of 'np', not the end use of 'bus'.Looks correct to me. What about missing
of_node_put()forof_get_next_child()also in the_init()function?Regards,
Quoted 7 lines
Quoted 1 line
Tony
Thanks, Tony.
I have found this bug but not send the patch for
of_get_next_child()
as I am collecting other OF function related bugs and I have been told that it is better to collect all similar bugs in same directory, then finally report them.
Well in this case while you review a single function, it's usually better to fix similar issues to avoid having to review the same function multiple times. Of course if the patch becomes hard to read, then it makes sense to split it into several patches.
Quoted 2 lines
So I will send a new patch for both of the two missing 'put' bugs caused by
of_find_xxx()andof_get_xxx()inomap_hwmod.c
Please just update this patch so we have _init() completely reviewed for similar issues and is not left only partially patched.
Regards,
Tony