From nobody Sun Feb 8 09:16:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1629460999; cv=none; d=zohomail.com; s=zohoarc; b=RHc85sss2vApMRpDZi1FlfPluOKBFolMmtI3I921i9HS6k5sm6BDGtoUaKVbdI+PZG43nVLB0o9+ybohOlBqLdiB7LnULPoMcRqrHe8Wuj96EQmNYgmcC2jul/xsbcA3mrAbdl39FGArg/tSCe9/XMhULbF0oVy+QtDIUBBXNfo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629460999; 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=dxfwOYb8pZZ9FaZ4jjqyMVotTm2qnLPSuAbbH+v+8pk=; b=f9jmOX84jHPrgu0bSCnjn4PTZIrxLrrv6i07VkXx1abxONrDPiIugeV7reHefoekpahj2NTS+e002CVuxWknmVtEDHTkb53/oqWCHxPqyF62S5IzIN1Mq/xQdVNujebqyMfhwNLB73HtRvtfJWi0Tf/F0t/YVhaai1uhTIrVR60= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629460999366491.84783370675734; Fri, 20 Aug 2021 05:03:19 -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-351-76js2W4JO72W-jYA6cEHVw-1; Fri, 20 Aug 2021 08:01:22 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id A57831026211; Fri, 20 Aug 2021 12:01:17 +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 8127A1346F; Fri, 20 Aug 2021 12:01:17 +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 3F365181A2A8; Fri, 20 Aug 2021 12:01:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17KBvd5b007846 for ; Fri, 20 Aug 2021 07:57:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 30B6A6A057; Fri, 20 Aug 2021 11:57:39 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.43.2.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id AFD0E1B49E for ; Fri, 20 Aug 2021 11:57:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629460998; 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=dxfwOYb8pZZ9FaZ4jjqyMVotTm2qnLPSuAbbH+v+8pk=; b=Smj4WjcdWW+9GTzJAEqGXXSVjMLZhWuSwSP0GZDI4bkgqkIuKWahjJgN8mpDGFMev1LoW0 P1RZxv+fciMfFAp3SQ7M50y/2bcu50p6yTR8eoUo75Wlok05yxluG44S91Fq5214WGz570 KWk5d6tRpbDt+neZolO4Eed0eiDbj0Y= X-MC-Unique: 76js2W4JO72W-jYA6cEHVw-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 4/6] nwfilter_conf: add validation against schema in define Date: Fri, 20 Aug 2021 13:57:08 +0200 Message-Id: <2be98f58a71bb43090b5bb5bc76f667e4fcdc787.1629460370.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.79 on 10.5.11.11 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: 1629460999849100001 Content-Type: text/plain; charset="utf-8" This patch also includes propagation of flags into the virNWFilterDefParse(). Signed-off-by: Kristina Hanicova --- src/conf/nwfilter_conf.c | 13 ++++++++----- src/conf/nwfilter_conf.h | 3 ++- src/nwfilter/nwfilter_driver.c | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 7d491e27b1..a3109962af 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2739,12 +2739,14 @@ virNWFilterDefParseNode(xmlDocPtr xml, =20 static virNWFilterDef * virNWFilterDefParse(const char *xmlStr, - const char *filename) + const char *filename, + unsigned int flags) { virNWFilterDef *def =3D NULL; g_autoptr(xmlDoc) xml =3D NULL; =20 - if ((xml =3D virXMLParse(filename, xmlStr, _("(nwfilter_definition)"),= NULL, false))) { + if ((xml =3D virXMLParse(filename, xmlStr, _("(nwfilter_definition)"),= "nwfilter.rng", + flags & VIR_NWFILTER_DEFINE_VALIDATE))) { def =3D virNWFilterDefParseNode(xml, xmlDocGetRootElement(xml)); } =20 @@ -2753,16 +2755,17 @@ virNWFilterDefParse(const char *xmlStr, =20 =20 virNWFilterDef * -virNWFilterDefParseString(const char *xmlStr) +virNWFilterDefParseString(const char *xmlStr, + unsigned int flags) { - return virNWFilterDefParse(xmlStr, NULL); + return virNWFilterDefParse(xmlStr, NULL, flags); } =20 =20 virNWFilterDef * virNWFilterDefParseFile(const char *filename) { - return virNWFilterDefParse(NULL, filename); + return virNWFilterDefParse(NULL, filename, 0); } =20 =20 diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 8d5684eb4e..bbe12284a5 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -546,7 +546,8 @@ virNWFilterSaveConfig(const char *configDir, virNWFilterDef *def); =20 virNWFilterDef * -virNWFilterDefParseString(const char *xml); +virNWFilterDefParseString(const char *xml, + unsigned int flags); =20 virNWFilterDef * virNWFilterDefParseFile(const char *filename); diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 4b355ffff1..4cfdd42a37 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -547,7 +547,7 @@ nwfilterDefineXMLFlags(virConnectPtr conn, nwfilterDriverLock(); virNWFilterWriteLockFilterUpdates(); =20 - if (!(def =3D virNWFilterDefParseString(xml))) + if (!(def =3D virNWFilterDefParseString(xml, 0))) goto cleanup; =20 if (virNWFilterDefineXMLFlagsEnsureACL(conn, def) < 0) --=20 2.31.1