From nobody Tue Nov 18 11:51:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1610449088; cv=none; d=zohomail.com; s=zohoarc; b=Ux0jnK/D02F4hYk4ql+BOLG9E7WpW+znoKn/59jJJGJQYs0TSB8KNyRCR1GbZQjBlaHe0QaJmGD7ylCa974VsJnVps3siiBreP2/n7eX8oGQkwDCDmlNWcoggnYpdlLJhOSE44ps4hsxe017BfXyGLmfbAl9qF5Nf/Sj4+3ckGc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610449088; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=j/G3qbKBcEroIyhqWdb7rtrlccfC0EZHWlS/iqgBNNs=; b=Wpv42S8wfgKwLwohQWwB9Isf3snhnZdnlIKQhgAPYEn+Rp95PK8CQauW2Oa0Gvv3j0GnG1w1LJdyHd0lDOTtcjcQunFu2AVrhPQbE5re9cf5FJnkbW82Oar3s0l+QM+5wOu91WeD6Ek+r+ivullCIoIEHCBiat0L1ocRnCmSS5c= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610449088826894.4035689379009; Tue, 12 Jan 2021 02:58:08 -0800 (PST) Received: from localhost ([::1]:53698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzHNH-0000vY-O6 for importer@patchew.org; Tue, 12 Jan 2021 05:58:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzGnX-00063P-2X; Tue, 12 Jan 2021 05:21:11 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:2912) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzGnU-0003PV-HY; Tue, 12 Jan 2021 05:21:10 -0500 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4DFRQd0WSvz15r1q; Tue, 12 Jan 2021 18:19:53 +0800 (CST) Received: from huawei.com (10.175.104.175) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.498.0; Tue, 12 Jan 2021 18:20:47 +0800 From: Gan Qixin To: , Subject: [PATCH v2 2/2] misc/mos6522: Use timer_free() in the finalize function to avoid memleak Date: Tue, 12 Jan 2021 18:17:46 +0800 Message-ID: <20210112101746.379517-3-ganqixin@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210112101746.379517-1-ganqixin@huawei.com> References: <20210112101746.379517-1-ganqixin@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.104.175] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.190; envelope-from=ganqixin@huawei.com; helo=szxga04-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, zhang.zhanghailiang@huawei.com, Gan Qixin , Euler Robot , kuhn.chenqun@huawei.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" When running device-introspect-test, a memory leak occurred in the mos6522_= init function, this patch use timer_free() in the finalize function to fix it. ASAN shows memory leak stack: Direct leak of 96 byte(s) in 2 object(s) allocated from: #0 0xfffd5fe9e1f0 in __interceptor_calloc (/lib64/libasan.so.5+0xee1f0) #1 0xfffd5f7b6800 in g_malloc0 (/lib64/libglib-2.0.so.0+0x56800) #2 0xaaae50303d0c in timer_new_full qemu/include/qemu/timer.h:523 #3 0xaaae50303d0c in timer_new qemu/include/qemu/timer.h:544 #4 0xaaae50303d0c in timer_new_ns qemu/include/qemu/timer.h:562 #5 0xaaae50303d0c in mos6522_init qemu/hw/misc/mos6522.c:490 #6 0xaaae50b77d70 in object_init_with_type qemu/qom/object.c:371 #7 0xaaae50b7ae84 in object_initialize_with_type qemu/qom/object.c:515 #8 0xaaae50b7b0f8 in object_new_with_type qemu/qom/object.c:729 #9 0xaaae50bb6d58 in qmp_device_list_properties qemu/qom/qom-qmp-cmds.c= :153 #10 0xaaae50d7e1dc in qmp_marshal_device_list_properties qemu/qapi/qapi= -commands-qdev.c:59 #11 0xaaae50dc87a0 in do_qmp_dispatch_bh qemu/qapi/qmp-dispatch.c:110 #12 0xaaae50d931a0 in aio_bh_call qemu/util/async.c:136 Reported-by: Euler Robot Signed-off-by: Gan Qixin Acked-by: David Gibson --- Cc: David Gibson --- hw/misc/mos6522.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/misc/mos6522.c b/hw/misc/mos6522.c index ac4cd1d58e..0236eeece1 100644 --- a/hw/misc/mos6522.c +++ b/hw/misc/mos6522.c @@ -490,6 +490,16 @@ static void mos6522_init(Object *obj) s->timers[1].timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, mos6522_timer2= , s); } =20 +static void mos6522_finalize(Object *obj) +{ + MOS6522State *s =3D MOS6522(obj); + + timer_del(s->timers[0].timer); + timer_free(s->timers[0].timer); + timer_del(s->timers[1].timer); + timer_free(s->timers[1].timer); +} + static Property mos6522_properties[] =3D { DEFINE_PROP_UINT64("frequency", MOS6522State, frequency, 0), DEFINE_PROP_END_OF_LIST() @@ -519,6 +529,7 @@ static const TypeInfo mos6522_type_info =3D { .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(MOS6522State), .instance_init =3D mos6522_init, + .instance_finalize =3D mos6522_finalize, .abstract =3D true, .class_size =3D sizeof(MOS6522DeviceClass), .class_init =3D mos6522_class_init, --=20 2.27.0