2022-06-15 13:21:02

by Liang He

Subject: [PATCH] arch: x86: kernel: Add missing of_node_put() in x86_init.c

In x86_wallclock_init(), we need to use of_node_put() for the
of_find_matching_node() which returns a node pointer with refcount
incremented.

Signed-off-by: Liang He <[email protected]>
---
arch/x86/kernel/x86_init.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index e84ee5cdbd8c..81c071080efe 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -50,6 +50,7 @@ static __init void x86_wallclock_init(void)
struct device_node *node = of_find_matching_node(NULL, of_cmos_match);

if (node && !of_device_is_available(node)) {
+ of_node_put(node);
x86_platform.get_wallclock = get_rtc_noop;
x86_platform.set_wallclock = set_rtc_noop;
}
--
2.25.1

2022-10-17 14:30:35

by Thomas Gleixner

Subject: Re: [PATCH] arch: x86: kernel: Add missing of_node_put() in x86_init.c

Liang,

On Wed, Jun 15 2022 at 20:57, Liang He wrote:

please check https://www.kernel.org/doc/html/latest/process/maintainer-tip.html
for instructions vs. subject prefixes and changelogs.

> In x86_wallclock_init(), we need to use of_node_put() for the
> of_find_matching_node() which returns a node pointer with refcount
> incremented.
>
> Signed-off-by: Liang He <[email protected]>
> ---
> arch/x86/kernel/x86_init.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
> index e84ee5cdbd8c..81c071080efe 100644
> --- a/arch/x86/kernel/x86_init.c
> +++ b/arch/x86/kernel/x86_init.c
> @@ -50,6 +50,7 @@ static __init void x86_wallclock_init(void)
> struct device_node *node = of_find_matching_node(NULL, of_cmos_match);
>
> if (node && !of_device_is_available(node)) {
> + of_node_put(node);
> x86_platform.get_wallclock = get_rtc_noop;
> x86_platform.set_wallclock = set_rtc_noop;
> }

That still leaks the node in the case when the device is available, no?

Thanks,

tglx