From nobody Thu Apr 25 19:33:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1528887127187606.6003050489329; Wed, 13 Jun 2018 03:52:07 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E4940C04AC51; Wed, 13 Jun 2018 10:52:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A02AD98E00; Wed, 13 Jun 2018 10:52:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EDB384CA80; Wed, 13 Jun 2018 10:52:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5DAq1hR011248 for ; Wed, 13 Jun 2018 06:52:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id BE2A620244E0; Wed, 13 Jun 2018 10:52:01 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 633072017D0F for ; Wed, 13 Jun 2018 10:52:01 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Wed, 13 Jun 2018 12:51:57 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] qemuBuildSevCommandLine: s/obj/buf/ X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 13 Jun 2018 10:52:06 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The variable points to a buffer not a domain object therefore its current name is misleading. Signed-off-by: Michal Privoznik Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_command.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6a95344fd5..a7f659308c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9694,7 +9694,7 @@ static int qemuBuildSevCommandLine(virDomainObjPtr vm, virCommandPtr cmd, virDomainSevDefPtr sev) { - virBuffer obj =3D VIR_BUFFER_INITIALIZER; + virBuffer buf =3D VIR_BUFFER_INITIALIZER; qemuDomainObjPrivatePtr priv =3D vm->privateData; char *path =3D NULL; =20 @@ -9704,25 +9704,25 @@ qemuBuildSevCommandLine(virDomainObjPtr vm, virComm= andPtr cmd, VIR_DEBUG("policy=3D0x%x cbitpos=3D%d reduced_phys_bits=3D%d", sev->policy, sev->cbitpos, sev->reduced_phys_bits); =20 - virBufferAsprintf(&obj, "sev-guest,id=3Dsev0,cbitpos=3D%d", sev->cbitp= os); - virBufferAsprintf(&obj, ",reduced-phys-bits=3D%d", sev->reduced_phys_b= its); - virBufferAsprintf(&obj, ",policy=3D0x%x", sev->policy); + virBufferAsprintf(&buf, "sev-guest,id=3Dsev0,cbitpos=3D%d", sev->cbitp= os); + virBufferAsprintf(&buf, ",reduced-phys-bits=3D%d", sev->reduced_phys_b= its); + virBufferAsprintf(&buf, ",policy=3D0x%x", sev->policy); =20 if (sev->dh_cert) { if (virAsprintf(&path, "%s/dh_cert.base64", priv->libDir) < 0) return -1; - virBufferAsprintf(&obj, ",dh-cert-file=3D%s", path); + virBufferAsprintf(&buf, ",dh-cert-file=3D%s", path); VIR_FREE(path); } =20 if (sev->session) { if (virAsprintf(&path, "%s/session.base64", priv->libDir) < 0) return -1; - virBufferAsprintf(&obj, ",session-file=3D%s", path); + virBufferAsprintf(&buf, ",session-file=3D%s", path); VIR_FREE(path); } =20 - virCommandAddArgList(cmd, "-object", virBufferContentAndReset(&obj), N= ULL); + virCommandAddArgList(cmd, "-object", virBufferContentAndReset(&buf), N= ULL); return 0; } =20 --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 19:33:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1528887139248947.5038514137398; Wed, 13 Jun 2018 03:52:19 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 80A8D13A9B; Wed, 13 Jun 2018 10:52:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2D746600C8; Wed, 13 Jun 2018 10:52:16 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8417A1800532; Wed, 13 Jun 2018 10:52:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5DAq2FS011383 for ; Wed, 13 Jun 2018 06:52:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 604BC2026987; Wed, 13 Jun 2018 10:52:02 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0539020244E1 for ; Wed, 13 Jun 2018 10:52:01 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Wed, 13 Jun 2018 12:51:58 +0200 Message-Id: <73a59eab6bab7edbd9745b75a3786cf42c4533f5.1528887096.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] qemuBuildSevCommandLine: fix buffer leak X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 13 Jun 2018 10:52:17 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The buffer is not freed anywhere. Nor in the error paths. Also the usage virCommand with respect to buffer is very odd. =3D=3D2504=3D=3D 1,100 bytes in 1 blocks are definitely lost in loss record= 167 of 175 =3D=3D2504=3D=3D at 0x4C2CE3F: malloc (vg_replace_malloc.c:298) =3D=3D2504=3D=3D by 0x4C2F1BF: realloc (vg_replace_malloc.c:785) =3D=3D2504=3D=3D by 0x5D32EE2: virReallocN (viralloc.c:245) =3D=3D2504=3D=3D by 0x5D37278: virBufferGrow (virbuffer.c:150) =3D=3D2504=3D=3D by 0x5D3783E: virBufferVasprintf (virbuffer.c:408) =3D=3D2504=3D=3D by 0x5D377A9: virBufferAsprintf (virbuffer.c:381) =3D=3D2504=3D=3D by 0x57017C1: qemuBuildSevCommandLine (qemu_command.c:9= 707) =3D=3D2504=3D=3D by 0x57030F7: qemuBuildCommandLine (qemu_command.c:1032= 4) =3D=3D2504=3D=3D by 0x575FA48: qemuProcessCreatePretendCmd (qemu_process= .c:6644) =3D=3D2504=3D=3D by 0x11351A: testCompareXMLToArgv (qemuxml2argvtest.c:5= 64) =3D=3D2504=3D=3D by 0x1392F7: virTestRun (testutils.c:180) =3D=3D2504=3D=3D by 0x137895: mymain (qemuxml2argvtest.c:2900) Signed-off-by: Michal Privoznik Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_command.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a7f659308c..796831f79c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9697,6 +9697,7 @@ qemuBuildSevCommandLine(virDomainObjPtr vm, virComman= dPtr cmd, virBuffer buf =3D VIR_BUFFER_INITIALIZER; qemuDomainObjPrivatePtr priv =3D vm->privateData; char *path =3D NULL; + int ret =3D -1; =20 if (!sev) return 0; @@ -9710,20 +9711,24 @@ qemuBuildSevCommandLine(virDomainObjPtr vm, virComm= andPtr cmd, =20 if (sev->dh_cert) { if (virAsprintf(&path, "%s/dh_cert.base64", priv->libDir) < 0) - return -1; + goto cleanup; virBufferAsprintf(&buf, ",dh-cert-file=3D%s", path); VIR_FREE(path); } =20 if (sev->session) { if (virAsprintf(&path, "%s/session.base64", priv->libDir) < 0) - return -1; + goto cleanup; virBufferAsprintf(&buf, ",session-file=3D%s", path); VIR_FREE(path); } =20 - virCommandAddArgList(cmd, "-object", virBufferContentAndReset(&buf), N= ULL); - return 0; + virCommandAddArg(cmd, "-object"); + virCommandAddArgBuffer(cmd, &buf); + ret =3D 0; + cleanup: + virBufferFreeAndReset(&buf); + return ret; } =20 static int --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 19:33:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1528887129135341.7876166262914; Wed, 13 Jun 2018 03:52:09 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E5FCBC0587FE; Wed, 13 Jun 2018 10:52:07 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 57FB917988; Wed, 13 Jun 2018 10:52:07 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 44C671808800; Wed, 13 Jun 2018 10:52:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5DAq3Fp011409 for ; Wed, 13 Jun 2018 06:52:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 02EF920244E1; Wed, 13 Jun 2018 10:52:03 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BA6B20244E0 for ; Wed, 13 Jun 2018 10:52:02 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Wed, 13 Jun 2018 12:51:59 +0200 Message-Id: <7198868aeefcd8f2d403bf4ca93232e641e5c835.1528887096.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/3] conf: Rework virDomainSEVDefParseXML() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 13 Jun 2018 10:52:08 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Firstly, this function changes node for relative XPaths but doesn't restore the original one in case VIR_ALLOC(def) fails. Secondly, @type is leaked. Thirdly, dh-cert and session attributes are strdup()-ed needlessly, virXPathString already does that so we can use the retval immediately. Signed-off-by: Michal Privoznik Reviewed-by: J=EF=BF=BDn Tomko --- src/conf/domain_conf.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 85f07af46e..c788b525b5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15849,17 +15849,16 @@ static virDomainSevDefPtr virDomainSEVDefParseXML(xmlNodePtr sevNode, xmlXPathContextPtr ctxt) { - char *tmp =3D NULL; char *type =3D NULL; xmlNodePtr save =3D ctxt->node; virDomainSevDefPtr def; unsigned long policy; =20 + if (VIR_ALLOC(def) < 0) + return NULL; + ctxt->node =3D sevNode; =20 - if (VIR_ALLOC(def) < 0) - return NULL; - if (!(type =3D virXMLPropString(sevNode, "type"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing launch-security type")); @@ -15899,29 +15898,18 @@ virDomainSEVDefParseXML(xmlNodePtr sevNode, } =20 def->policy =3D policy; + def->dh_cert =3D virXPathString("string(./dh-cert)", ctxt); + def->session =3D virXPathString("string(./session)", ctxt); =20 - if ((tmp =3D virXPathString("string(./dh-cert)", ctxt))) { - if (VIR_STRDUP(def->dh_cert, tmp) < 0) - goto error; - - VIR_FREE(tmp); - } - - if ((tmp =3D virXPathString("string(./session)", ctxt))) { - if (VIR_STRDUP(def->session, tmp) < 0) - goto error; - - VIR_FREE(tmp); - } - + cleanup: + VIR_FREE(type); ctxt->node =3D save; return def; =20 error: - VIR_FREE(tmp); virDomainSEVDefFree(def); - ctxt->node =3D save; - return NULL; + def =3D NULL; + goto cleanup; } =20 static virDomainMemoryDefPtr --=20 2.16.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list