From nobody Sun May 12 03:04:46 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1708950241522333.6802243928922; Mon, 26 Feb 2024 04:24:01 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3A35C1AAC; Mon, 26 Feb 2024 07:24:00 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id BDA511A5C; Mon, 26 Feb 2024 07:22:45 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6DC7B199F; Mon, 26 Feb 2024 07:22:41 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 646311A40 for ; Mon, 26 Feb 2024 07:22:40 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-668-sG9LlN2aOIGFtMgp0DgXPg-1; Mon, 26 Feb 2024 07:22:38 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A498083B825 for ; Mon, 26 Feb 2024 12:22:38 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4CB001121337 for ; Mon, 26 Feb 2024 12:22:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: sG9LlN2aOIGFtMgp0DgXPg-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH] nodedevmdevctltest: Fix two memleaks Date: Mon, 26 Feb 2024 13:22:37 +0100 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: XQA6K7MGGHWT4PQ23IOX4CVM3O5SRUM6 X-Message-ID-Hash: XQA6K7MGGHWT4PQ23IOX4CVM3O5SRUM6 X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1708950243213100001 There are two memleaks inside of nodedevmdevctltest: 1) In the testCommandDryRunCallback() - when appending lines to stdinbuf the pointer is overwritten without freeing the old memory it pointed to. 2) In testMdevctlModify() the livecmd variable is reused and since its marked as g_autoptr() the first use leaks. Signed-off-by: Michal Privoznik Reviewed-by: Boris Fiuczynski Reviewed-by: Peter Krempa --- tests/nodedevmdevctltest.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/nodedevmdevctltest.c b/tests/nodedevmdevctltest.c index de688c982e..827036fa74 100644 --- a/tests/nodedevmdevctltest.c +++ b/tests/nodedevmdevctltest.c @@ -33,10 +33,13 @@ testCommandDryRunCallback(const char *const*args G_GNUC= _UNUSED, { char **stdinbuf =3D opaque; =20 - if (*stdinbuf) - *stdinbuf =3D g_strconcat(*stdinbuf, "\n", input, NULL); - else + if (*stdinbuf) { + char *new =3D g_strconcat(*stdinbuf, "\n", input, NULL); + VIR_FREE(*stdinbuf); + *stdinbuf =3D g_steal_pointer(&new); + } else { *stdinbuf =3D g_strdup(input); + } } =20 typedef virCommand * (*MdevctlCmdFunc)(virNodeDeviceDef *, char **, char *= *); @@ -188,6 +191,7 @@ testMdevctlModify(const void *data G_GNUC_UNUSED) int ret =3D -1; g_autoptr(virCommand) definedcmd =3D NULL; g_autoptr(virCommand) livecmd =3D NULL; + g_autoptr(virCommand) livecmd_update =3D NULL; g_autoptr(virCommand) bothcmd =3D NULL; g_autofree char *errmsg =3D NULL; g_autofree char *stdinbuf =3D NULL; @@ -222,10 +226,10 @@ testMdevctlModify(const void *data G_GNUC_UNUSED) &parser_callbacks, NULL, fals= e))) goto cleanup; =20 - if (!(livecmd =3D nodeDeviceGetMdevctlModifyCommand(def_update, false,= true, &errmsg))) + if (!(livecmd_update =3D nodeDeviceGetMdevctlModifyCommand(def_update,= false, true, &errmsg))) goto cleanup; =20 - if (virCommandRun(livecmd, NULL) < 0) + if (virCommandRun(livecmd_update, NULL) < 0) goto cleanup; =20 if (!(livecmd =3D nodeDeviceGetMdevctlModifyCommand(def, false, true, = &errmsg))) --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org