From nobody Wed May 14 16:41:56 2025 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 1520346494836264.7282141612337; Tue, 6 Mar 2018 06:28:14 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 939A185376; Tue, 6 Mar 2018 14:28:13 +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 583D6177F8; Tue, 6 Mar 2018 14:28:13 +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 EA807181A881; Tue, 6 Mar 2018 14:28:12 +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 w26ES1Av023088 for ; Tue, 6 Mar 2018 09:28:01 -0500 Received: by smtp.corp.redhat.com (Postfix) id A07D42024CAE; Tue, 6 Mar 2018 14:28:01 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B0022024CAD; Tue, 6 Mar 2018 14:28:01 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 6 Mar 2018 15:27:14 +0100 Message-Id: <35876bf476d4f401b43a95943b0ed41df387064c.1520346349.git.pkrempa@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 Cc: Peter Krempa Subject: [libvirt] [PATCH 5/6] util: storage: Sanitize parsing of disk encryption XMLs 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 06 Mar 2018 14:28:14 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Pass in the XPath context as we do in all other places rather than allocating a new one. Signed-off-by: Peter Krempa --- src/conf/domain_conf.c | 9 +++++---- src/conf/storage_conf.c | 3 +-- src/util/virstorageencryption.c | 37 ++++++++----------------------------- src/util/virstorageencryption.h | 4 ++-- 4 files changed, 16 insertions(+), 37 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 31b2590a13..f5bc6148a2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8542,7 +8542,8 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, static int virDomainDiskSourceEncryptionParse(xmlNodePtr node, - virStorageEncryptionPtr *encryptionsrc) + virStorageEncryptionPtr *encryptionsrc, + xmlXPathContextPtr ctxt) { xmlNodePtr child; virStorageEncryptionPtr encryption =3D NULL; @@ -8551,7 +8552,7 @@ virDomainDiskSourceEncryptionParse(xmlNodePtr node, if (child->type =3D=3D XML_ELEMENT_NODE && virXMLNodeNameEqual(child, "encryption")) { - if (!(encryption =3D virStorageEncryptionParseNode(node->doc, = child))) + if (!(encryption =3D virStorageEncryptionParseNode(child, ctxt= ))) return -1; *encryptionsrc =3D encryption; @@ -8637,7 +8638,7 @@ virDomainDiskSourceParse(xmlNodePtr node, !(src->auth =3D virStorageAuthDefParse(tmp, ctxt))) goto cleanup; - if (virDomainDiskSourceEncryptionParse(node, &src->encryption) < 0) + if (virDomainDiskSourceEncryptionParse(node, &src->encryption, ctxt) <= 0) goto cleanup; if (virDomainDiskSourcePrivateDataParse(ctxt, src, flags, xmlopt) < 0) @@ -9408,7 +9409,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } - if (!(encryption =3D virStorageEncryptionParseNode(node->doc, = cur))) + if (!(encryption =3D virStorageEncryptionParseNode(cur, ctxt))) goto error; } else if (!serial && virXMLNodeNameEqual(cur, "serial")) { diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index f1f469d462..5036ab9ef8 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1209,8 +1209,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, node =3D virXPathNode("./target/encryption", ctxt); if (node !=3D NULL) { - ret->target.encryption =3D virStorageEncryptionParseNode(ctxt->doc, - node); + ret->target.encryption =3D virStorageEncryptionParseNode(node, ctx= t); if (ret->target.encryption =3D=3D NULL) goto error; } diff --git a/src/util/virstorageencryption.c b/src/util/virstorageencryptio= n.c index f3de5ff7a7..77c46faf8e 100644 --- a/src/util/virstorageencryption.c +++ b/src/util/virstorageencryption.c @@ -242,9 +242,11 @@ virStorageEncryptionInfoParseIvgen(xmlNodePtr info_nod= e, } -static virStorageEncryptionPtr -virStorageEncryptionParseXML(xmlXPathContextPtr ctxt) +virStorageEncryptionPtr +virStorageEncryptionParseNode(xmlNodePtr node, + xmlXPathContextPtr ctxt) { + xmlNodePtr saveNode =3D ctxt->node; xmlNodePtr *nodes =3D NULL; virStorageEncryptionPtr encdef =3D NULL; virStorageEncryptionPtr ret =3D NULL; @@ -252,6 +254,8 @@ virStorageEncryptionParseXML(xmlXPathContextPtr ctxt) int n; size_t i; + ctxt->node =3D node; + if (VIR_ALLOC(encdef) < 0) goto cleanup; @@ -311,34 +315,9 @@ virStorageEncryptionParseXML(xmlXPathContextPtr ctxt) VIR_FREE(format_str); VIR_FREE(nodes); virStorageEncryptionFree(encdef); - return ret; -} - -virStorageEncryptionPtr -virStorageEncryptionParseNode(xmlDocPtr xml, xmlNodePtr root) -{ - xmlXPathContextPtr ctxt =3D NULL; - virStorageEncryptionPtr enc =3D NULL; - - if (STRNEQ((const char *) root->name, "encryption")) { - virReportError(VIR_ERR_XML_ERROR, - "%s", _("unknown root element for volume " - "encryption information")); - goto cleanup; - } + ctxt->node =3D saveNode; - ctxt =3D xmlXPathNewContext(xml); - if (ctxt =3D=3D NULL) { - virReportOOMError(); - goto cleanup; - } - - ctxt->node =3D root; - enc =3D virStorageEncryptionParseXML(ctxt); - - cleanup: - xmlXPathFreeContext(ctxt); - return enc; + return ret; } diff --git a/src/util/virstorageencryption.h b/src/util/virstorageencryptio= n.h index 42f990c494..1c0a39c32e 100644 --- a/src/util/virstorageencryption.h +++ b/src/util/virstorageencryption.h @@ -83,8 +83,8 @@ virStorageEncryptionPtr virStorageEncryptionCopy(const vi= rStorageEncryption *src void virStorageEncryptionFree(virStorageEncryptionPtr enc); -virStorageEncryptionPtr virStorageEncryptionParseNode(xmlDocPtr xml, - xmlNodePtr root); +virStorageEncryptionPtr virStorageEncryptionParseNode(xmlNodePtr node, + xmlXPathContextPtr c= txt); int virStorageEncryptionFormat(virBufferPtr buf, virStorageEncryptionPtr enc); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list