Skip to content

Commit a4bc033

Browse files
Ganqxpm215
authored andcommitted
musicpal: Use ptimer_free() in the finalize function to avoid memleaks
When running device-introspect-test, a memory leak occurred in the mv88w8618_pit_init function, so use ptimer_free() in the finalize function to avoid it. ASAN shows memory leak stack: Indirect leak of 192 byte(s) in 4 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 0xaaabf555db84 in timer_new_full /qemu/include/qemu/timer.h:523 qemu#3 0xaaabf555db84 in timer_new /qemu/include/qemu/timer.h:544 qemu#4 0xaaabf555db84 in timer_new_ns /qemu/include/qemu/timer.h:562 qemu#5 0xaaabf555db84 in ptimer_init /qemu/hw/core/ptimer.c:433 qemu#6 0xaaabf5bb2290 in mv88w8618_timer_init /qemu/hw/arm/musicpal.c:862 qemu#7 0xaaabf5bb2290 in mv88w8618_pit_init /qemu/hw/arm/musicpal.c:954 qemu#8 0xaaabf6339f6c in object_initialize_with_type /qemu/qom/object.c:515 qemu#9 0xaaabf633a1e0 in object_new_with_type /qemu/qom/object.c:729 qemu#10 0xaaabf6375e40 in qmp_device_list_properties /qemu/qom/qom-qmp-cmds.c:153 qemu#11 0xaaabf5a95540 in qdev_device_help /qemu/softmmu/qdev-monitor.c:283 qemu#12 0xaaabf5a96940 in qmp_device_add /qemu/softmmu/qdev-monitor.c:801 Reported-by: Euler Robot <[email protected]> Signed-off-by: Gan Qixin <[email protected]> Reviewed-by: Peter Maydell <[email protected]> Signed-off-by: Peter Maydell <[email protected]>
1 parent e494004 commit a4bc033

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

Diff for: hw/arm/musicpal.c

+12
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,17 @@ static void mv88w8618_pit_init(Object *obj)
959959
sysbus_init_mmio(dev, &s->iomem);
960960
}
961961

962+
static void mv88w8618_pit_finalize(Object *obj)
963+
{
964+
SysBusDevice *dev = SYS_BUS_DEVICE(obj);
965+
mv88w8618_pit_state *s = MV88W8618_PIT(dev);
966+
int i;
967+
968+
for (i = 0; i < 4; i++) {
969+
ptimer_free(s->timer[i].ptimer);
970+
}
971+
}
972+
962973
static const VMStateDescription mv88w8618_timer_vmsd = {
963974
.name = "timer",
964975
.version_id = 1,
@@ -994,6 +1005,7 @@ static const TypeInfo mv88w8618_pit_info = {
9941005
.parent = TYPE_SYS_BUS_DEVICE,
9951006
.instance_size = sizeof(mv88w8618_pit_state),
9961007
.instance_init = mv88w8618_pit_init,
1008+
.instance_finalize = mv88w8618_pit_finalize,
9971009
.class_init = mv88w8618_pit_class_init,
9981010
};
9991011

0 commit comments

Comments
 (0)