[libvirt] [PATCH v2 3/4] conf: forbid seclabel duplicates for domain devices
Parser checks for per-domain seclabel duplicates, so it would be nice if
it checked for per-device seclabel duplicates the same way
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1165485
---
src/conf/domain_conf.c | 9 ++++++
.../qemuxml2argv-seclabel-device-duplicates.xml | 33 ++++++++++++++++++++++
tests/qemuxml2argvtest.c | 1 +
3 files changed, 43 insertions(+)
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-seclabel-device-duplicates.xml
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 6a57d80..7f242f1 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5421,6 +5421,15 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDefPtr
**seclabels_rtn,
break;
}
}
+
+ /* check for duplicate seclabels */
+ for (j = 0; j < i; j++) {
+ if (STREQ_NULLABLE(model, seclabels[j]->model)) {
+ virReportError(VIR_ERR_XML_DETAIL,
+ _("seclabel for model %s is already
provided"), model);
+ goto error;
+ }
+ }
seclabels[i]->model = model;
}
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-device-duplicates.xml
b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-device-duplicates.xml
new file mode 100644
index 0000000..0ba26b6
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-device-duplicates.xml
@@ -0,0 +1,33 @@
+<domain type='qemu' id='1'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219100</memory>
+ <currentMemory unit='KiB'>219100</currentMemory>
+ <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu>
+ <os>
+ <type arch='i686' machine='pc'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu</emulator>
+ <disk type='block' device='disk'>
+ <source dev='/dev/HostVG/QEMUGuest1'>
+ <seclabel model='selinux' relabel='no'/>
+ <seclabel model='selinux' relabel='no'/>
+ <seclabel model='selinux' relabel='no'/>
+ </source>
+ <target dev='hda' bus='ide'/>
+ <address type='drive' controller='0' bus='0'
target='0' unit='0'/>
+ </disk>
+ <controller type='usb' index='0'/>
+ <controller type='ide' index='0'/>
+ <controller type='pci' index='0' model='pci-root'/>
+ <memballoon model='virtio'/>
+ </devices>
+ <seclabel type='none' relabel='no'/>
+ <seclabel type='dynamic' model='dac' relabel='yes'/>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index f864c2a..395cab3 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1302,6 +1302,7 @@ mymain(void)
DO_TEST("seclabel-none", QEMU_CAPS_NAME);
DO_TEST("seclabel-dac-none", QEMU_CAPS_NAME);
DO_TEST_PARSE_ERROR("seclabel-multiple", QEMU_CAPS_NAME);
+ DO_TEST_PARSE_ERROR("seclabel-device-duplicates", QEMU_CAPS_NAME);
DO_TEST("pseries-basic",
QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
--
1.9.3