* [PATCH] x86, olpc: Avoid leak OF node on error
@ 2022-05-23 11:12 cgel.zte
2022-05-23 11:53 ` Hans de Goede
2022-05-23 11:53 ` Johan Hovold
0 siblings, 2 replies; 3+ messages in thread
From: cgel.zte @ 2022-05-23 11:12 UTC (permalink / raw)
To: dvhart
Cc: andy, tglx, platform-driver-x86, linux-kernel, Minghao Chi, Zeal Robot
From: Minghao Chi <chi.minghao@zte.com.cn>
The OF node should be put before returning error in xo1_rtc_init(),
otherwise node's refcount will be leaked.
Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
---
arch/x86/platform/olpc/olpc-xo1-rtc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/platform/olpc/olpc-xo1-rtc.c b/arch/x86/platform/olpc/olpc-xo1-rtc.c
index 57f210cda761..dc5ac56cd9dd 100644
--- a/arch/x86/platform/olpc/olpc-xo1-rtc.c
+++ b/arch/x86/platform/olpc/olpc-xo1-rtc.c
@@ -59,9 +59,9 @@ static int __init xo1_rtc_init(void)
struct device_node *node;
node = of_find_compatible_node(NULL, NULL, "olpc,xo1-rtc");
+ of_node_put(node);
if (!node)
return 0;
- of_node_put(node);
pr_info("olpc-xo1-rtc: Initializing OLPC XO-1 RTC\n");
rdmsrl(MSR_RTC_DOMA_OFFSET, rtc_info.rtc_day_alarm);
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] x86, olpc: Avoid leak OF node on error
2022-05-23 11:12 [PATCH] x86, olpc: Avoid leak OF node on error cgel.zte
@ 2022-05-23 11:53 ` Hans de Goede
2022-05-23 11:53 ` Johan Hovold
1 sibling, 0 replies; 3+ messages in thread
From: Hans de Goede @ 2022-05-23 11:53 UTC (permalink / raw)
To: cgel.zte, dvhart
Cc: andy, tglx, platform-driver-x86, linux-kernel, Minghao Chi, Zeal Robot
Hi,
On 5/23/22 13:12, cgel.zte@gmail.com wrote:
> From: Minghao Chi <chi.minghao@zte.com.cn>
>
> The OF node should be put before returning error in xo1_rtc_init(),
> otherwise node's refcount will be leaked.
>
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
> ---
> arch/x86/platform/olpc/olpc-xo1-rtc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/platform/olpc/olpc-xo1-rtc.c b/arch/x86/platform/olpc/olpc-xo1-rtc.c
> index 57f210cda761..dc5ac56cd9dd 100644
> --- a/arch/x86/platform/olpc/olpc-xo1-rtc.c
> +++ b/arch/x86/platform/olpc/olpc-xo1-rtc.c
> @@ -59,9 +59,9 @@ static int __init xo1_rtc_init(void)
> struct device_node *node;
>
> node = of_find_compatible_node(NULL, NULL, "olpc,xo1-rtc");
> + of_node_put(node);
> if (!node)
> return 0;
> - of_node_put(node);
>
> pr_info("olpc-xo1-rtc: Initializing OLPC XO-1 RTC\n");
> rdmsrl(MSR_RTC_DOMA_OFFSET, rtc_info.rtc_day_alarm);
of_node_put on a NULL node is a no-op, so this patch
does not make any functional difference and it makes the
code harder to read.
nack.
Regards,
Hans
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] x86, olpc: Avoid leak OF node on error
2022-05-23 11:12 [PATCH] x86, olpc: Avoid leak OF node on error cgel.zte
2022-05-23 11:53 ` Hans de Goede
@ 2022-05-23 11:53 ` Johan Hovold
1 sibling, 0 replies; 3+ messages in thread
From: Johan Hovold @ 2022-05-23 11:53 UTC (permalink / raw)
To: cgel.zte
Cc: dvhart, andy, tglx, platform-driver-x86, linux-kernel,
Minghao Chi, Zeal Robot
On Mon, May 23, 2022 at 11:12:53AM +0000, cgel.zte@gmail.com wrote:
> From: Minghao Chi <chi.minghao@zte.com.cn>
>
> The OF node should be put before returning error in xo1_rtc_init(),
> otherwise node's refcount will be leaked.
>
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
> ---
> arch/x86/platform/olpc/olpc-xo1-rtc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/platform/olpc/olpc-xo1-rtc.c b/arch/x86/platform/olpc/olpc-xo1-rtc.c
> index 57f210cda761..dc5ac56cd9dd 100644
> --- a/arch/x86/platform/olpc/olpc-xo1-rtc.c
> +++ b/arch/x86/platform/olpc/olpc-xo1-rtc.c
> @@ -59,9 +59,9 @@ static int __init xo1_rtc_init(void)
> struct device_node *node;
>
> node = of_find_compatible_node(NULL, NULL, "olpc,xo1-rtc");
> + of_node_put(node);
> if (!node)
> return 0;
> - of_node_put(node);
Is this a joke? Don't you guys even try to understand the code your
"robot" tells you to change?
Please don't send any more patches until you've figured out how you
messed up here.
> pr_info("olpc-xo1-rtc: Initializing OLPC XO-1 RTC\n");
> rdmsrl(MSR_RTC_DOMA_OFFSET, rtc_info.rtc_day_alarm);
Johan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-23 11:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-23 11:12 [PATCH] x86, olpc: Avoid leak OF node on error cgel.zte
2022-05-23 11:53 ` Hans de Goede
2022-05-23 11:53 ` Johan Hovold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).