[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH 1/2] s390x: fix memleaks in cpu_finalize

From: Philippe Mathieu-Daudé
Subject: Re: [PATCH 1/2] s390x: fix memleaks in cpu_finalize
Date: Sat, 15 Feb 2020 11:28:35 +0100
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1

Hi Pan,

On 2/15/20 9:32 AM, address@hidden wrote:
From: Pan Nengyuan <address@hidden>

This patch fix memleaks when we call tests/qtest/cpu-plug-test on s390x. The 
leak stack is as follow:

Direct leak of 48 byte(s) in 1 object(s) allocated from:
     #0 0x7fb43c7cd970 in __interceptor_calloc (/lib64/libasan.so.5+0xef970)
     #1 0x7fb43be2149d in g_malloc0 (/lib64/libglib-2.0.so.0+0x5249d)
     #2 0x558ba96da716 in timer_new_full 
     #3 0x558ba96da716 in timer_new 
     #4 0x558ba96da716 in timer_new_ns 
     #5 0x558ba96da716 in s390_cpu_initfn 
     #6 0x558ba9c969ab in object_init_with_type 
     #7 0x558ba9c9eb5f in object_initialize_with_type 
     #8 0x558ba9c9f053 in object_new_with_type 
     #9 0x558ba967ede6 in s390x_new_cpu 
     #10 0x558ba99764b3 in hmp_cpu_add 
     #11 0x558ba9b1c27f in handle_hmp_command 
     #12 0x558ba96c1b02 in qmp_human_monitor_command 

Reported-by: Euler Robot <address@hidden>
Signed-off-by: Pan Nengyuan <address@hidden>
  target/s390x/cpu.c | 4 ++++
  1 file changed, 4 insertions(+)

diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index cf84d307c6..fff793a4eb 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -294,6 +294,10 @@ static void s390_cpu_finalize(Object *obj)
qemu_unregister_reset(s390_cpu_machine_reset_cb, cpu);
+    timer_del(cpu->env.tod_timer);
+    timer_del(cpu->env.cpu_timer);

Similarly to your other cleanups, shouldn't we move the timer_new_ns() into a realize() function, then do the timer_del() in unrealize()?

+    timer_free(cpu->env.tod_timer);
+    timer_free(cpu->env.cpu_timer);

The timer_free() is correct.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]