[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/7] musicpal: Use ptimer_free() in the finalize function to avoi
From: |
Gan Qixin |
Subject: |
[PATCH 7/7] musicpal: Use ptimer_free() in the finalize function to avoid memleaks |
Date: |
Fri, 27 Nov 2020 15:18:03 +0800 |
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
#3 0xaaabf555db84 in timer_new /qemu/include/qemu/timer.h:544
#4 0xaaabf555db84 in timer_new_ns /qemu/include/qemu/timer.h:562
#5 0xaaabf555db84 in ptimer_init /qemu/hw/core/ptimer.c:433
#6 0xaaabf5bb2290 in mv88w8618_timer_init /qemu/hw/arm/musicpal.c:862
#7 0xaaabf5bb2290 in mv88w8618_pit_init /qemu/hw/arm/musicpal.c:954
#8 0xaaabf6339f6c in object_initialize_with_type /qemu/qom/object.c:515
#9 0xaaabf633a1e0 in object_new_with_type /qemu/qom/object.c:729
#10 0xaaabf6375e40 in qmp_device_list_properties
/qemu/qom/qom-qmp-cmds.c:153
#11 0xaaabf5a95540 in qdev_device_help /qemu/softmmu/qdev-monitor.c:283
#12 0xaaabf5a96940 in qmp_device_add /qemu/softmmu/qdev-monitor.c:801
Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Gan Qixin <ganqixin@huawei.com>
---
Cc: Jan Kiszka <jan.kiszka@web.de>
---
hw/arm/musicpal.c | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 458b1cbeb7..0e77082e52 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -959,6 +959,17 @@ static void mv88w8618_pit_init(Object *obj)
sysbus_init_mmio(dev, &s->iomem);
}
+static void mv88w8618_pit_finalize(Object *obj)
+{
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
+ mv88w8618_pit_state *s = MV88W8618_PIT(dev);
+ int i;
+
+ for (i = 0; i < 4; i++) {
+ ptimer_free(s->timer[i].ptimer);
+ }
+}
+
static const VMStateDescription mv88w8618_timer_vmsd = {
.name = "timer",
.version_id = 1,
@@ -990,11 +1001,12 @@ static void mv88w8618_pit_class_init(ObjectClass *klass,
void *data)
}
static const TypeInfo mv88w8618_pit_info = {
- .name = TYPE_MV88W8618_PIT,
- .parent = TYPE_SYS_BUS_DEVICE,
- .instance_size = sizeof(mv88w8618_pit_state),
- .instance_init = mv88w8618_pit_init,
- .class_init = mv88w8618_pit_class_init,
+ .name = TYPE_MV88W8618_PIT,
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(mv88w8618_pit_state),
+ .instance_init = mv88w8618_pit_init,
+ .instance_finalize = mv88w8618_pit_finalize,
+ .class_init = mv88w8618_pit_class_init,
};
/* Flash config register offsets */
--
2.23.0
- [PATCH 0/7] Fix some memleaks caused by ptimer_init, Gan Qixin, 2020/11/27
- [PATCH 5/7] exynos4210_rtc: Use ptimer_free() in the finalize function to avoid memleaks, Gan Qixin, 2020/11/27
- [PATCH 7/7] musicpal: Use ptimer_free() in the finalize function to avoid memleaks,
Gan Qixin <=
- [PATCH 1/7] allwinner-a10-pit: Use ptimer_free() in the finalize function to avoid memleaks, Gan Qixin, 2020/11/27
- [PATCH 4/7] exynos4210_pwm: Use ptimer_free() in the finalize function to avoid memleaks, Gan Qixin, 2020/11/27
- [PATCH 3/7] exynos4210_mct: Use ptimer_free() in the finalize function to avoid memleaks, Gan Qixin, 2020/11/27
- [PATCH 2/7] digic-timer: Use ptimer_free() in the finalize function to avoid memleaks, Gan Qixin, 2020/11/27
- [PATCH 6/7] mss-timer: Use ptimer_free() in the finalize function to avoid memleaks, Gan Qixin, 2020/11/27