Skip to content

Commit b026d4a

Browse files
Ganqxvivier
authored andcommitted
pl031: Use timer_free() in the finalize function to avoid memleaks
When running device-introspect-test, a memory leak occurred in the pl031_init function, this patch use timer_free() in the finalize function to fix it. ASAN shows memory leak stack: Direct leak of 48 byte(s) in 1 object(s) allocated from: #0 0xffffab97e1f0 in __interceptor_calloc (/lib64/libasan.so.5+0xee1f0) #1 0xffffab256800 in g_malloc0 (/lib64/libglib-2.0.so.0+0x56800) #2 0xaaabf5621cfc in timer_new_full qemu/include/qemu/timer.h:523 #3 0xaaabf5621cfc in timer_new qemu/include/qemu/timer.h:544 #4 0xaaabf5621cfc in timer_new_ns qemu/include/qemu/timer.h:562 #5 0xaaabf5621cfc in pl031_init qemu/hw/rtc/pl031.c:194 #6 0xaaabf6339f6c in object_initialize_with_type qemu/qom/object.c:515 #7 0xaaabf633a1e0 in object_new_with_type qemu/qom/object.c:729 #8 0xaaabf6375e40 in qmp_device_list_properties qemu/qom/qom-qmp-cmds.c:153 #9 0xaaabf5a95540 in qdev_device_help qemu/softmmu/qdev-monitor.c:283 #10 0xaaabf5a96940 in qmp_device_add qemu/softmmu/qdev-monitor.c:801 #11 0xaaabf5a96e70 in hmp_device_add qemu/softmmu/qdev-monitor.c:916 #12 0xaaabf5ac0a2c in handle_hmp_command qemu/monitor/hmp.c:1100 Reported-by: Euler Robot <[email protected]> Signed-off-by: Gan Qixin <[email protected]> Reviewed-by: Peter Maydell <[email protected]> Message-Id: <[email protected]> Signed-off-by: Laurent Vivier <[email protected]>
1 parent a821858 commit b026d4a

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

hw/rtc/pl031.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,13 @@ static void pl031_init(Object *obj)
194194
s->timer = timer_new_ns(rtc_clock, pl031_interrupt, s);
195195
}
196196

197+
static void pl031_finalize(Object *obj)
198+
{
199+
PL031State *s = PL031(obj);
200+
201+
timer_free(s->timer);
202+
}
203+
197204
static int pl031_pre_save(void *opaque)
198205
{
199206
PL031State *s = opaque;
@@ -329,6 +336,7 @@ static const TypeInfo pl031_info = {
329336
.parent = TYPE_SYS_BUS_DEVICE,
330337
.instance_size = sizeof(PL031State),
331338
.instance_init = pl031_init,
339+
.instance_finalize = pl031_finalize,
332340
.class_init = pl031_class_init,
333341
};
334342

0 commit comments

Comments
 (0)