From nobody Tue Dec 16 08:03:46 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1503302862326258.2285725412745; Mon, 21 Aug 2017 01:07:42 -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 9DB3681E0D; Mon, 21 Aug 2017 08:07:40 +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 699D36F94A; Mon, 21 Aug 2017 08:07:40 +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 2E0EF3FAD9; Mon, 21 Aug 2017 08:07:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v7L87XAL002492 for ; Mon, 21 Aug 2017 04:07:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id B30986F924; Mon, 21 Aug 2017 08:07:33 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B3BB6F92B for ; Mon, 21 Aug 2017 08:07:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9DB3681E0D Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 21 Aug 2017 10:07:12 +0200 Message-Id: <2b8018cd291bb50c7b27781d8c2a8a0fb632aa3e.1503302799.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 12/17] conf: move UDP chardev source parsing to separate function 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.25]); Mon, 21 Aug 2017 08:07:41 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The extra check whether (connect|bind)(Host|Service) was set is required because for UDP chardev there can be two source elements. Without the check there could be a memory leak. Signed-off-by: Pavel Hrdina --- src/conf/domain_conf.c | 56 ++++++++++++++++++++++------------------------= ---- 1 file changed, 25 insertions(+), 31 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 023d86cec5..d8a195a141 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10966,6 +10966,29 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDe= fPtr def, =20 =20 static int +virDomainChrSourceDefParseUDP(virDomainChrSourceDefPtr def, + xmlNodePtr source) +{ + int mode; + + if ((mode =3D virDomainChrSourceDefParseMode(source)) < 0) + return -1; + + if (mode =3D=3D VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT && + !def->data.udp.connectHost && !def->data.udp.connectService) { + def->data.udp.connectHost =3D virXMLPropString(source, "host"); + def->data.udp.connectService =3D virXMLPropString(source, "service= "); + } else if (mode =3D=3D VIR_DOMAIN_CHR_SOURCE_MODE_BIND && + !def->data.udp.bindHost && !def->data.udp.bindService) { + def->data.udp.bindHost =3D virXMLPropString(source, "host"); + def->data.udp.bindService =3D virXMLPropString(source, "service"); + } + + return 0; +} + + +static int virDomainChrSourceDefParseProtocol(virDomainChrSourceDefPtr def, xmlNodePtr protocol) { @@ -11028,10 +11051,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDe= fPtr def, { int ret =3D -1; int mode =3D VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT; - char *bindHost =3D NULL; - char *bindService =3D NULL; - char *connectHost =3D NULL; - char *connectService =3D NULL; char *path =3D NULL; char *channel =3D NULL; char *master =3D NULL; @@ -11083,19 +11102,8 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDe= fPtr def, break; =20 case VIR_DOMAIN_CHR_TYPE_UDP: - if ((mode =3D virDomainChrSourceDefParseMode(cur)) < 0) + if (virDomainChrSourceDefParseUDP(def, cur) < 0) goto error; - if (mode =3D=3D VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT) { - if (!connectHost) - connectHost =3D virXMLPropString(cur, "host"); - if (!connectService) - connectService =3D virXMLPropString(cur, "service"= ); - } else if (mode =3D=3D VIR_DOMAIN_CHR_SOURCE_MODE_BIND) { - if (!bindHost) - bindHost =3D virXMLPropString(cur, "host"); - if (!bindService) - bindService =3D virXMLPropString(cur, "service"); - } break; =20 case VIR_DOMAIN_CHR_TYPE_TCP: @@ -11224,21 +11232,11 @@ virDomainChrSourceDefParseXML(virDomainChrSourceD= efPtr def, break; =20 case VIR_DOMAIN_CHR_TYPE_UDP: - if (!connectService) { + if (!def->data.udp.connectService) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing source service attribute for char de= vice")); goto error; } - - def->data.udp.connectHost =3D connectHost; - connectHost =3D NULL; - def->data.udp.connectService =3D connectService; - connectService =3D NULL; - - def->data.udp.bindHost =3D bindHost; - bindHost =3D NULL; - def->data.udp.bindService =3D bindService; - bindService =3D NULL; break; =20 case VIR_DOMAIN_CHR_TYPE_UNIX: @@ -11276,10 +11274,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDe= fPtr def, =20 ret =3D 0; cleanup: - VIR_FREE(bindHost); - VIR_FREE(bindService); - VIR_FREE(connectHost); - VIR_FREE(connectService); VIR_FREE(path); VIR_FREE(channel); VIR_FREE(append); --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list