From nobody Mon Feb 9 06:40:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629982335; cv=none; d=zohomail.com; s=zohoarc; b=GTE4pvwCbwUcTT0vigQv6BFpfahOdb/r0M81Q2SoM5iKiJUG7fu4pxE7aq91TRI1rSZBQqqsSAQmb5ZPHjFlErdk5dony5MR9SUw4KS7GcTvNx6V4Ekopeu/6ow0/F2VGF3UyEZMhqOmw7T+ORf/HUTujy5AXl9Zs7QHbMKV4po= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629982335; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p8eScdcSsqgtOLQ/yUnPPY0YKpILEIDkunNWYVZzOdI=; b=h7ft7VhnTc1CDlsx9U4Gk8yfLL7oSxMnsJs+ENGVCld0RlYC60icMZJHsuipO53uHbVncaSY3/ZcEDBwjc1OhBAyEeVRRP835UN73d9JyQoDCbnOHVIMAdFmicHVAs81mIGxycYzWBPBvLMjozuTU11CUetLhSixjynHKKvzEXo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1629982335659566.341651743514; Thu, 26 Aug 2021 05:52:15 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-272-0_f4rRK7M7-JrS7EttdL-A-1; Thu, 26 Aug 2021 08:52:12 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10BD3800493; Thu, 26 Aug 2021 12:52:08 +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 DEA8FE2CD; Thu, 26 Aug 2021 12: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 A8EC6181A3F3; Thu, 26 Aug 2021 12:52:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17QCODvf015106 for ; Thu, 26 Aug 2021 08:24:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1B11A6788B; Thu, 26 Aug 2021 12:24:13 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.43.2.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 98E4B5FC25 for ; Thu, 26 Aug 2021 12:24:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629982334; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=p8eScdcSsqgtOLQ/yUnPPY0YKpILEIDkunNWYVZzOdI=; b=Q1Jt424SMITJqp2/9K8z39hVEu2j19kc3ie02zDCsZMAxpkC0x2MTuUav+xwDHCtmTJHIo BA97OMhN/qvGGFOSACO9gN7E8N1nGm9Qyg6l0Wv6mnTbA5L4JOv5oUleE1soPQoUx7QPYl TW1PK4jqyeyRV2tBtU5Kn+FWByv5Lj8= X-MC-Unique: 0_f4rRK7M7-JrS7EttdL-A-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 2/4] conf: virnetworkportdef: add validation against schema in network port create Date: Thu, 26 Aug 2021 14:23:55 +0200 Message-Id: <8b764cf5c9c12809ac9d316f37121412ca279de8.1629980447.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629982337592100001 Content-Type: text/plain; charset="utf-8" We need to validate the XML against schema if option '--validate' was passed to the virsh command. This patch also includes propagation of flags into the virNetworkPortDefParse(). Signed-off-by: Kristina Hanicova --- src/conf/domain_conf.c | 2 +- src/conf/virnetworkportdef.c | 14 +++++++++----- src/conf/virnetworkportdef.h | 3 ++- src/network/bridge_driver.c | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6127513117..dbefc98ee8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -30330,7 +30330,7 @@ virDomainNetCreatePort(virConnectPtr conn, VIR_FREE(portxml); =20 if (!(portxml =3D virNetworkPortGetXMLDesc(port, 0)) || - !(portdef =3D virNetworkPortDefParseString(portxml)) || + !(portdef =3D virNetworkPortDefParseString(portxml, 0)) || virDomainNetDefActualFromNetworkPort(iface, portdef) < 0) { virErrorPreserveLast(&save_err); virNetworkPortDelete(port, 0); diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index c1749eebe0..1ca1eddb5a 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -287,12 +287,15 @@ virNetworkPortDefParseNode(xmlDocPtr xml, =20 static virNetworkPortDef * virNetworkPortDefParse(const char *xmlStr, - const char *filename) + const char *filename, + unsigned int flags) { virNetworkPortDef *def =3D NULL; g_autoptr(xmlDoc) xml =3D NULL; =20 - if ((xml =3D virXMLParse(filename, xmlStr, _("(networkport_definition)= "), NULL, false))) { + if ((xml =3D virXMLParse(filename, xmlStr, _("(networkport_definition)= "), + "networkport.rng", + flags & VIR_NETWORK_PORT_CREATE_VALIDATE))) { def =3D virNetworkPortDefParseNode(xml, xmlDocGetRootElement(xml)); } =20 @@ -301,16 +304,17 @@ virNetworkPortDefParse(const char *xmlStr, =20 =20 virNetworkPortDef * -virNetworkPortDefParseString(const char *xmlStr) +virNetworkPortDefParseString(const char *xmlStr, + unsigned int flags) { - return virNetworkPortDefParse(xmlStr, NULL); + return virNetworkPortDefParse(xmlStr, NULL, flags); } =20 =20 virNetworkPortDef * virNetworkPortDefParseFile(const char *filename) { - return virNetworkPortDefParse(NULL, filename); + return virNetworkPortDefParse(NULL, filename, 0); } =20 =20 diff --git a/src/conf/virnetworkportdef.h b/src/conf/virnetworkportdef.h index 0ac232d16a..5c7cd2953e 100644 --- a/src/conf/virnetworkportdef.h +++ b/src/conf/virnetworkportdef.h @@ -86,7 +86,8 @@ virNetworkPortDefParseNode(xmlDocPtr xml, xmlNodePtr root); =20 virNetworkPortDef * -virNetworkPortDefParseString(const char *xml); +virNetworkPortDefParseString(const char *xml, + unsigned int flags); =20 virNetworkPortDef * virNetworkPortDefParseFile(const char *filename); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index e8b9ffa1fc..7513ddad48 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -5287,7 +5287,7 @@ networkPortCreateXML(virNetworkPtr net, =20 def =3D virNetworkObjGetDef(obj); =20 - if (!(portdef =3D virNetworkPortDefParseString(xmldesc))) + if (!(portdef =3D virNetworkPortDefParseString(xmldesc, 0))) goto cleanup; =20 if (virNetworkPortCreateXMLEnsureACL(net->conn, def, portdef) < 0) --=20 2.31.1