From: Gan Qixin <ganqixin@huawei.com>
To: <qemu-devel@nongnu.org>, <qemu-trivial@nongnu.org>
Cc: Peter Maydell <peter.maydell@linaro.org>,
zhang.zhanghailiang@huawei.com,
Subbaraya Sundeep <sundeep.lkml@gmail.com>,
Gan Qixin <ganqixin@huawei.com>,
Euler Robot <euler.robot@huawei.com>,
kuhn.chenqun@huawei.com
Subject: [PATCH v2 6/7] mss-timer: Use ptimer_free() in the finalize function to avoid memleaks
Date: Thu, 17 Dec 2020 19:31:53 +0800 [thread overview]
Message-ID: <20201217113154.121668-6-ganqixin@huawei.com> (raw)
In-Reply-To: <20201217113154.121668-1-ganqixin@huawei.com>
When running device-introspect-test, a memory leak occurred in the
mss_timer_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 2 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 0xaaabf555db78 in ptimer_init /qemu/hw/core/ptimer.c:432
#3 0xaaabf58a0010 in mss_timer_init /qemu/hw/timer/mss-timer.c:235
#4 0xaaabf6339f6c in object_initialize_with_type /qemu/qom/object.c:515
#5 0xaaabf633ca04 in object_initialize_child_with_propsv /qemu/qom/object.c:564
#6 0xaaabf633cc08 in object_initialize_child_with_props /qemu/qom/object.c:547
#7 0xaaabf5b8316c in m2sxxx_soc_initfn /qemu/hw/arm/msf2-soc.c:70
#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 0xaaabf653d8ec in qmp_marshal_device_list_properties /qemu/qapi/qapi-commands-qdev.c:59
#12 0xaaabf6587d08 in do_qmp_dispatch_bh /qemu/qapi/qmp-dispatch.c:110
Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Gan Qixin <ganqixin@huawei.com>
---
Cc: Subbaraya Sundeep <sundeep.lkml@gmail.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
---
hw/timer/mss-timer.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c
index 29943fd744..fe0ca905f3 100644
--- a/hw/timer/mss-timer.c
+++ b/hw/timer/mss-timer.c
@@ -244,6 +244,18 @@ static void mss_timer_init(Object *obj)
sysbus_init_mmio(SYS_BUS_DEVICE(obj), &t->mmio);
}
+static void mss_timer_finalize(Object *obj)
+{
+ MSSTimerState *t = MSS_TIMER(obj);
+ int i;
+
+ for (i = 0; i < NUM_TIMERS; i++) {
+ struct Msf2Timer *st = &t->timers[i];
+
+ ptimer_free(st->ptimer);
+ }
+}
+
static const VMStateDescription vmstate_timers = {
.name = "mss-timer-block",
.version_id = 1,
@@ -287,6 +299,7 @@ static const TypeInfo mss_timer_info = {
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(MSSTimerState),
.instance_init = mss_timer_init,
+ .instance_finalize = mss_timer_finalize,
.class_init = mss_timer_class_init,
};
--
2.23.0
next prev parent reply other threads:[~2020-12-17 11:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-17 11:31 [PATCH v2 1/7] allwinner-a10-pit: Use ptimer_free() in the finalize function to avoid memleaks Gan Qixin
2020-12-17 11:31 ` [PATCH v2 2/7] digic-timer: " Gan Qixin
2020-12-17 11:31 ` [PATCH v2 3/7] exynos4210_mct: " Gan Qixin
2020-12-17 11:31 ` [PATCH v2 4/7] exynos4210_pwm: " Gan Qixin
2020-12-17 11:31 ` [PATCH v2 5/7] exynos4210_rtc: " Gan Qixin
2020-12-17 11:31 ` Gan Qixin [this message]
2020-12-17 11:31 ` [PATCH v2 7/7] musicpal: " Gan Qixin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201217113154.121668-6-ganqixin@huawei.com \
--to=ganqixin@huawei.com \
--cc=euler.robot@huawei.com \
--cc=kuhn.chenqun@huawei.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=sundeep.lkml@gmail.com \
--cc=zhang.zhanghailiang@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).