2022-06-19 06:19:17

by Liang He

Subject: [PATCH v2] mips/pic32/pic32mzda: Fix refcount leak bugs

of_find_matching_node(), of_find_compatible_node() and
of_find_node_by_path() will return node pointers with refcout
incremented. We should call of_node_put() when they are not
used anymore.

Signed-off-by: Liang He <[email protected]>
---
changelog:

v2: (1) merge pic32/pic32mzda bugs into one patch
(2) fix leak bug related to of_find_node_by_path.
v1: use two patch for intit.c and time.c

arch/mips/pic32/pic32mzda/init.c | 7 ++++++-
arch/mips/pic32/pic32mzda/time.c | 3 +++
2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/arch/mips/pic32/pic32mzda/init.c b/arch/mips/pic32/pic32mzda/init.c
index 129915616763..d9c8c4e46aff 100644
--- a/arch/mips/pic32/pic32mzda/init.c
+++ b/arch/mips/pic32/pic32mzda/init.c
@@ -98,13 +98,18 @@ static int __init pic32_of_prepare_platform_data(struct of_dev_auxdata *lookup)
np = of_find_compatible_node(NULL, NULL, lookup->compatible);
if (np) {
lookup->name = (char *)np->name;
- if (lookup->phys_addr)
+ if (lookup->phys_addr) {
+ of_node_put(np);
continue;
+ }
if (!of_address_to_resource(np, 0, &res))
lookup->phys_addr = res.start;
+ of_node_put(np);
}
}

+ of_node_put(root);
+
return 0;
}

diff --git a/arch/mips/pic32/pic32mzda/time.c b/arch/mips/pic32/pic32mzda/time.c
index 7174e9abbb1b..777b515c52c8 100644
--- a/arch/mips/pic32/pic32mzda/time.c
+++ b/arch/mips/pic32/pic32mzda/time.c
@@ -32,6 +32,9 @@ static unsigned int pic32_xlate_core_timer_irq(void)
goto default_map;

irq = irq_of_parse_and_map(node, 0);
+
+ of_node_put(node);
+
if (!irq)
goto default_map;

--
2.25.1

2022-06-21 15:23:41

by Thomas Bogendoerfer

Subject: Re: [PATCH v2] mips/pic32/pic32mzda: Fix refcount leak bugs

On Sun, Jun 19, 2022 at 12:54:27PM +0800, Liang He wrote:
> of_find_matching_node(), of_find_compatible_node() and
> of_find_node_by_path() will return node pointers with refcout
> incremented. We should call of_node_put() when they are not
> used anymore.
>
> Signed-off-by: Liang He <[email protected]>
> ---
> changelog:
>
> v2: (1) merge pic32/pic32mzda bugs into one patch
> (2) fix leak bug related to of_find_node_by_path.
> v1: use two patch for intit.c and time.c
>
> arch/mips/pic32/pic32mzda/init.c | 7 ++++++-
> arch/mips/pic32/pic32mzda/time.c | 3 +++
> 2 files changed, 9 insertions(+), 1 deletion(-)

applied to mips-fixes.

Thomas.

--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]