From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 454B6C38142 for ; Mon, 23 Jan 2023 13:34:06 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJwwh-00027D-8Y; Mon, 23 Jan 2023 08:33:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pJwwY-0001zD-KL for qemu-devel@nongnu.org; Mon, 23 Jan 2023 08:33:06 -0500 Received: from smtp-out2.suse.de ([2001:67c:2178:6::1d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJwwW-0001NH-PC for qemu-devel@nongnu.org; Mon, 23 Jan 2023 08:33:02 -0500 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id E4A801FDA8; Mon, 23 Jan 2023 13:32:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1674480776; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nxFzmHqpn6I4uPDBYgm34c1WdmGGhDALd9zw44rMlUM=; b=AZtoU0uCSoWpajVHJb3tNfdMEvY7kNKom7tunr6j3ZoJK0b3Af9Fp3IGbxlGJqR9FcGSgt 1eHyeOyVOA1O55pel0qnY1pjcRot1Vd9WEcSGU7D/Sh+T8GEMzRn1x3XWmlIyCNoJrwg0n qEqZ9q4yCMdnWUICDA60CCkc4YUkGaM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1674480776; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nxFzmHqpn6I4uPDBYgm34c1WdmGGhDALd9zw44rMlUM=; b=hIpM8ARMWkeZc/2LEhCAiqBK4eQXMweASVT/lrVAn8aa+0IQVtr3G3VXU64PRGGTiu2ljh fEUS9rdyoS1ukBAg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 6D3121357F; Mon, 23 Jan 2023 13:32:56 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id IIDCDYiMzmOPDwAAMHmgww (envelope-from ); Mon, 23 Jan 2023 13:32:56 +0000 From: Fabiano Rosas To: Thomas Huth , qemu-devel@nongnu.org Cc: Laurent Vivier , Paolo Bonzini Subject: Re: [PATCH] tests/qtest: Plug memory leaks in qtest_get_machines In-Reply-To: <77fcbf0a-0f9a-d3bc-c1cf-0ec3e21399c9@redhat.com> References: <20230120194435.29796-1-farosas@suse.de> <77fcbf0a-0f9a-d3bc-c1cf-0ec3e21399c9@redhat.com> Date: Mon, 23 Jan 2023 10:32:54 -0300 Message-ID: <877cxdcr5l.fsf@suse.de> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2001:67c:2178:6::1d; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Thomas Huth writes: > On 20/01/2023 20.44, Fabiano Rosas wrote: >> These leaks can be avoided: >> >> 759 bytes in 61 blocks are still reachable in loss record 56 of 60 >> at 0x4034744: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) >> by 0x4A88518: g_malloc (in /usr/lib64/libglib-2.0.so.0.7000.5) >> by 0x4AA313E: g_strdup (in /usr/lib64/libglib-2.0.so.0.7000.5) >> by 0x12083E: qtest_get_machines (libqtest.c:1323) >> by 0x12098C: qtest_cb_for_every_machine (libqtest.c:1348) >> by 0x11556C: main (test-hmp.c:160) >> >> 992 bytes in 1 blocks are still reachable in loss record 57 of 60 >> at 0x4034744: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) >> by 0x4A88518: g_malloc (in /usr/lib64/libglib-2.0.so.0.7000.5) >> by 0x120725: qtest_get_machines (libqtest.c:1313) >> by 0x12098C: qtest_cb_for_every_machine (libqtest.c:1348) >> by 0x11556C: main (test-hmp.c:160) >> >> Signed-off-by: Fabiano Rosas >> --- >> tests/qtest/libqtest.c | 14 ++++++++++++++ >> 1 file changed, 14 insertions(+) >> >> diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c >> index 6b2216cb20..65abac5029 100644 >> --- a/tests/qtest/libqtest.c >> +++ b/tests/qtest/libqtest.c >> @@ -1285,6 +1285,18 @@ struct MachInfo { >> char *alias; >> }; >> >> +static void qtest_free_machine_info(gpointer data) >> +{ >> + struct MachInfo *machines = data; >> + int i; >> + >> + for (i = 0; machines[i].name != NULL; i++) { >> + g_free((void *)machines[i].name); > + g_free((void *)machines[i].alias); > > I'd suggest setting .name and .alias to NULL after freeing them, to avoid > that danling pointers are left behind. > >> + } >> + g_free(machines); >> +} >> + >> /* >> * Returns an array with pointers to the available machine names. >> * The terminating entry has the name set to NULL. >> @@ -1336,6 +1348,8 @@ static struct MachInfo *qtest_get_machines(void) >> qobject_unref(response); >> >> memset(&machines[idx], 0, sizeof(struct MachInfo)); /* Terminating entry */ >> + g_test_queue_destroy(qtest_free_machine_info, machines); > > So this frees the machines structure... > >> return machines; > > ... but here it gets returned, too? ... that looks wrong. Did you maybe > rather want to free it at the end of qtest_cb_for_every_machine() and > qtest_has_machine ? g_test_queue_destroy will only call qtest_free_machine_info during the test teardown phase: #0 qtest_free_machine_info (data=0x555555677870) at ../tests/qtest/libqtest.c:1289 #1 0x00007ffff7b1d9d1 in ?? () from /usr/lib64/libglib-2.0.so.0 #2 0x00007ffff7b1d8b3 in ?? () from /usr/lib64/libglib-2.0.so.0 #3 0x00007ffff7b1d8b3 in ?? () from /usr/lib64/libglib-2.0.so.0 #4 0x00007ffff7b1de82 in g_test_run_suite () from /usr/lib64/libglib-2.0.so.0 #5 0x00007ffff7b1deab in g_test_run () from /usr/lib64/libglib-2.0.so.0 #6 0x0000555555561221 in main (argc=, argv=) at ../tests/qtest/qom-test.c:12 As long as 'machines' is static and not being exposed to the tests, I think this should be fine.