From nobody Fri May  3 18:10:01 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1685364485; cv=none;
	d=zohomail.com; s=zohoarc;
	b=SerbRafF9GyK2/CZGn9Psih8RwtgUx+T2Q90jXMm/5qUPwPQ2SbHZO3LqqyT5DBfHc6xHTJ4TEAPlVS61FpE20GWdBwWdiw+c3NMqjI2LUQL+o5vtMrVyxm8vQ//TCwOwlEBxuSPmKPMhKTg4dsqqluwEVpNMBLbOIf/+bJikVc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1685364485;
 h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To;
	bh=L0QA+SpQyZM7lsIXqlPZ3K0E7d9b6IKBVqpl2QyvHB0=;
	b=N67XSrHyCtMAddlVWkOJMxAcWYvxUYXMJaiXyMhBZQ0F1gVjJVCT1FQ2Q/TW2Iiff/MUytxqMHELUuUv9/J/TGei8KAuzf42+p+LHPhhZXG4B0A6rw9CDyXrg8eGxwVN0mijcl+oWoi0NLgk5od72l4kFD7mcj53agf8AwnxVw4=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<mprivozn@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com
	with SMTPS id 1685364485304947.2266508224866;
 Mon, 29 May 2023 05:48:05 -0700 (PDT)
Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com
 [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-639-mdhfQEezNQWtUGjMwAn2fQ-1; Mon, 29 May 2023 08:47:53 -0400
Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com
 [10.11.54.10])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B2200185A78F;
	Mon, 29 May 2023 12:47:51 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (unknown [10.30.29.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 731CD492B0B;
	Mon, 29 May 2023 12:47:49 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (localhost [IPv6:::1])
	by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 4680E1946595;
	Mon, 29 May 2023 12:47:49 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com
 [10.11.54.7])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 72A2D1946595 for <libvir-list@listman.corp.redhat.com>;
 Mon, 29 May 2023 12:47:47 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id 53426140E955; Mon, 29 May 2023 12:47:47 +0000 (UTC)
Received: from localhost.localdomain (unknown [10.43.2.39])
 by smtp.corp.redhat.com (Postfix) with ESMTP id EE983140E954
 for <libvir-list@redhat.com>; Mon, 29 May 2023 12:47:46 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1685364484;
	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:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=L0QA+SpQyZM7lsIXqlPZ3K0E7d9b6IKBVqpl2QyvHB0=;
	b=JkfvYiWKZY2MPLFE0ZlaHmy1apgAVXINi2UgVvrlPSepFB0jdoF88PFyze4eG8vA7ZGu4w
	5DwJq7y6iWoQ5UBwLF1CxuZnCzxwOlWXMQYS0t86EVcF4fIrijqU3nmlgIWtNDQNpqZAo0
	XJoHTaqxEkql9+g46Mjff0dIv0Ltk+Y=
X-MC-Unique: mdhfQEezNQWtUGjMwAn2fQ-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH] conf: Reject invalid device's <seclabel relabel='yes'/> with
 no <label/>
Date: Mon, 29 May 2023 14:47:44 +0200
Message-Id: 
 <6b8391b2a0e13ad78f579fb6ca6a953e2c487e64.1685364464.git.mprivozn@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10
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: 1685364486303100001
Content-Type: text/plain; charset="utf-8"; x-default="true"

We allow (some) domain devices to have a different <seclabel/>
than the top level domain one (this is mostly to allow access to
a resource for multiple domains). Now, we do couple of sanity
checks for such <seclabel/>, e.g. when the <label/> is specified,
but '@relabel' is set to no. But what we are missing is the
opposite: then '@relabel' is set, but no <label/> was provided.

Our schema already denies such combination. Make our parser
behave the same.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D2160356
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c                        | 14 +++++++-
 .../seclabel-device-relabel-invalid.err       |  1 +
 .../seclabel-device-relabel-invalid.xml       | 35 +++++++++++++++++++
 tests/qemuxml2argvtest.c                      |  1 +
 4 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 tests/qemuxml2argvdata/seclabel-device-relabel-invalid.=
err
 create mode 100644 tests/qemuxml2argvdata/seclabel-device-relabel-invalid.=
xml

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e7226c5f99..0edb1bda9d 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6910,6 +6910,7 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLa=
belDef ***seclabels_rtn,
     for (i =3D 0; i < n; i++) {
         g_autofree char *model =3D NULL;
         g_autofree char *label =3D NULL;
+        int relabelSpecified;
         virTristateBool t;
=20
         /* get model associated to this override */
@@ -6926,7 +6927,9 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLa=
belDef ***seclabels_rtn,
             seclabels[i]->model =3D g_steal_pointer(&model);
         }
=20
-        if (virXMLPropTristateBool(list[i], "relabel", VIR_XML_PROP_NONE, =
&t) < 0)
+        relabelSpecified =3D virXMLPropTristateBool(list[i], "relabel",
+                                                  VIR_XML_PROP_NONE, &t);
+        if (relabelSpecified < 0)
             goto error;
=20
         seclabels[i]->relabel =3D true;
@@ -6953,6 +6956,15 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceL=
abelDef ***seclabels_rtn,
                            NULLSTR(seclabels[i]->model));
             goto error;
         }
+
+        if (relabelSpecified > 0 &&
+            flags & VIR_DOMAIN_DEF_PARSE_INACTIVE &&
+            seclabels[i]->relabel && !seclabels[i]->label) {
+            virReportError(VIR_ERR_XML_ERROR,
+                           _("Cannot specify relabel if label is missing. =
model=3D%1$s"),
+                           NULLSTR(seclabels[i]->model));
+            goto error;
+        }
     }
=20
     *nseclabels_rtn =3D nseclabels;
diff --git a/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.err b/t=
ests/qemuxml2argvdata/seclabel-device-relabel-invalid.err
new file mode 100644
index 0000000000..0bcdac9772
--- /dev/null
+++ b/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.err
@@ -0,0 +1 @@
+XML error: Cannot specify relabel if label is missing. model=3Dselinux
diff --git a/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml b/t=
ests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml
new file mode 100644
index 0000000000..f5e2c418b6
--- /dev/null
+++ b/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml
@@ -0,0 +1,35 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219100</memory>
+  <currentMemory unit=3D'KiB'>219100</currentMemory>
+  <vcpu placement=3D'static' cpuset=3D'1-4,8-20,525'>1</vcpu>
+  <os>
+    <type arch=3D'i686' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <disk type=3D'block' device=3D'disk'>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'>
+        <seclabel model=3D'dac' relabel=3D'no'/>
+        <seclabel model=3D'selinux' relabel=3D'yes'/>
+      </source>
+      <target dev=3D'hda' bus=3D'ide'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0'/>
+    <controller type=3D'ide' index=3D'0'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <memballoon model=3D'virtio'/>
+  </devices>
+  <seclabel type=3D'static' model=3D'selinux' relabel=3D'no'>
+    <label>system_u:system_r:svirt_custom_t:s0:c192,c392</label>
+  </seclabel>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 2cc9bd074a..d914d8cbea 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1913,6 +1913,7 @@ mymain(void)
     DO_TEST_NOCAPS("seclabel-dac-none");
     DO_TEST_PARSE_ERROR_NOCAPS("seclabel-multiple");
     DO_TEST_PARSE_ERROR_NOCAPS("seclabel-device-duplicates");
+    DO_TEST_PARSE_ERROR_NOCAPS("seclabel-device-relabel-invalid");
=20
     DO_TEST_CAPS_LATEST_PPC64("pseries-basic");
     DO_TEST_CAPS_LATEST_PPC64("pseries-vio");
--=20
2.39.3