From nobody Fri May 17 05:54:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=163.com ARC-Seal: i=1; a=rsa-sha256; t=1594739581; cv=none; d=zohomail.com; s=zohoarc; b=LVdO05cmgLBF7aVuFtsqHB4/F/BrQbRtlV3ASF2W4d1UO7QNAOIpHUjYMI+udthm8gbVxvbn5fD3VUelnQp1f8e4wjnnWgDHRHFALQfbm+/SOyEnM8Gyg7f/w2gSFZZwAk3x7YWoMoK227IKQX5Y2n7gLrSGV2XGQaGjYk4gw5M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594739581; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=jBpZ8VNk9K7vcuvwnQVFDcHvBEEGcPq+v0dDDXvYq00=; b=A2ByNyRXY9Drg3+bDEkaTXx6BAECUku6T9DlKvG7oNpYlrvDLVQSMBaNH8KRMp4CxZ3enVvJXcnQ5zFo53zzIdJRaZkaGxrlarMEUY5daK+wwcFfDmw5Q0n7stZ5hf/FMajYUmXqRzBuwaiO6NQbD0cGSrN+ZCBv3HjT9mlZCQs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594739581732661.1189933140171; Tue, 14 Jul 2020 08:13:01 -0700 (PDT) Received: from localhost ([::1]:60626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvMc8-0001PF-9G for importer@patchew.org; Tue, 14 Jul 2020 11:13:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvMbW-0000xc-Qf for qemu-devel@nongnu.org; Tue, 14 Jul 2020 11:12:22 -0400 Received: from mail-m971.mail.163.com ([123.126.97.1]:43776) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvMbQ-00009T-3u for qemu-devel@nongnu.org; Tue, 14 Jul 2020 11:12:21 -0400 Received: from localhost.localdomain (unknown [183.159.72.144]) by smtp1 (Coremail) with SMTP id GdxpCgBn_po8yw1fATzIBQ--.7224S4; Tue, 14 Jul 2020 23:11:57 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=jBpZ8VNk9K7vcuvwnQ VFDcHvBEEGcPq+v0dDDXvYq00=; b=djVRby0+PpN81rUqxE1116NQQRL5v++M2f DbmwXoSUp6biL4hE9UfjtRuv0wakGBna7OVDsCM/HDxDtlkfyRee03Ie9PqSNtqm 13jwBibdraNfVdaUoqZ8PiASCMDHMK7+x7SIfFYbmrzmImnLAItIWvdzWDCqAFtW 1o3WL3uOQ= From: Li Qiang To: pbonzini@redhat.com, berrange@redhat.com, ehabkost@redhat.com, armbru@redhat.com Subject: [PATCH] hmp: fix memory leak in qom_composition_compare() Date: Tue, 14 Jul 2020 08:11:52 -0700 Message-Id: <20200714151152.54760-1-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: GdxpCgBn_po8yw1fATzIBQ--.7224S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7CrWfWF1fAw1DKw4DGFWktFb_yoW8Zr1UpF nxXryIy34xt3y3ZFWkZ3WkuF1UXwsayay3Xasavw1jyrnIva47Wrn2kF15ZF1DW3yrZr9I 934Utr1DWayUAwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UbeOXUUUUU= X-Originating-IP: [183.159.72.144] X-CM-SenderInfo: 5oltjvrd6rljoofrz/1tbiTx1hbVsGVIUD0AAAsB 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=123.126.97.1; envelope-from=liq3ea@163.com; helo=mail-m971.mail.163.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/14 11:12:01 X-ACL-Warn: Detected OS = Linux 3.1-3.10 X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: Li Qiang , liq3ea@gmail.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @163.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" While 'make chekc', I got following error: root@ubuntu:~/qemu# ./tests/qtest/device-introspect-test /x86_64/device/introspect/list: OK /x86_64/device/introspect/list-fields: OK /x86_64/device/introspect/none: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D53741=3D=3DERROR: LeakSanitizer: detected memory leaks Direct leak of 212 byte(s) in 20 object(s) allocated from: #0 0x7f3b6319cb40 in __interceptor_malloc (/usr/lib/x86_64-linux-gnu/li= basan.so.4+0xdeb40) #1 0x7f3b62805ab8 in g_malloc (/usr/lib/x86_64-linux-gnu/libglib-2.0.so= .0+0x51ab8) SUMMARY: AddressSanitizer: 212 byte(s) leaked in 20 allocation(s). tests/qtest/libqtest.c:166: kill_qemu() tried to terminate QEMU process but= encountered exit status 1 (expected 0) Aborted (core dumped) This is because the 'info qom-tree' path has a memory leak and qemu exit 1. The leak is in 'qom_composition_compare'. This patch fixes this. Fixes: e8c9e65816f("qom: Make "info qom-tree" show children sorted") Signed-off-by: Li Qiang Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- qom/qom-hmp-cmds.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qom/qom-hmp-cmds.c b/qom/qom-hmp-cmds.c index 9ed8bb1c9f..3547d5ba4e 100644 --- a/qom/qom-hmp-cmds.c +++ b/qom/qom-hmp-cmds.c @@ -96,8 +96,10 @@ static void print_qom_composition(Monitor *mon, Object *= obj, int indent); =20 static int qom_composition_compare(const void *a, const void *b, void *ign= ore) { - return g_strcmp0(a ? object_get_canonical_path_component(a) : NULL, - b ? object_get_canonical_path_component(b) : NULL); + g_autofree char *t1 =3D a ? object_get_canonical_path_component(a) : N= ULL; + g_autofree char *t2 =3D b ? object_get_canonical_path_component(b) : N= ULL; + + return g_strcmp0(t1, t2); } =20 static int insert_qom_composition_child(Object *obj, void *opaque) --=20 2.17.1