External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Reject unsupported chardev backend protocols

Browse Source 
QEMU supports only 'raw' and 'telnet' in the

 <protocol type='telnets'/>

element. Reject 'telnets' and 'tls'. TLS transport for qemu chardevs is
configured via "tls='yes'" attribute added to the "<source>" element
instead, so this prevents potential misconfig as the value would be
silently accepted.

Closes: https://gitlab.com/libvirt/libvirt/-/issues/412
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-11-28 17:08:31 +01:00
parent 3778964207
commit 24d468993c
4 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu/qemu_validate.c
View File

@ -2044,6 +2044,25 @@ qemuValidateDomainChrSourceDef(const virDomainChrSourceDef *def,
{
switch ((virDomainChrType)def->type) {
case VIR_DOMAIN_CHR_TYPE_TCP:
switch (def->data.tcp.protocol) {
case VIR_DOMAIN_CHR_TCP_PROTOCOL_RAW:
case VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET:
break;
case VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNETS:
case VIR_DOMAIN_CHR_TCP_PROTOCOL_TLS:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("tcp chardev protocol '%1$s' not supported"),
virDomainChrTcpProtocolTypeToString(def->data.tcp.protocol));
return -1;
case VIR_DOMAIN_CHR_TCP_PROTOCOL_LAST:
default:
virReportEnumRangeError(virDomainChrTcpProtocol, def->data.tcp.protocol);
return -1;
}
if (qemuValidateDomainChrSourceReconnectDef(&def->data.tcp.reconnect) < 0)
return -1;
break;

1
tests/qemuxmlconfdata/serial-tcp-chardev-telnets.x86_64-latest.err Normal file
View File

@ -0,0 +1 @@
unsupported configuration: tcp chardev protocol 'tls' not supported

23
tests/qemuxmlconfdata/serial-tcp-chardev-telnets.xml Normal file
View File

@ -0,0 +1,23 @@
<domain type='qemu'>
<name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>219136</memory>
<vcpu placement='static'>1</vcpu>
<os>
<type arch='x86_64' machine='pc'>hvm</type>
</os>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<serial type='tcp'>
<source mode='connect' host='127.0.0.1' service='9999'/>
<protocol type='tls'/>
<target port='0'/>
</serial>
<console type='tcp'>
<source mode='connect' host='127.0.0.1' service='9999'/>
<protocol type='telnets'/>
<target port='0'/>
</console>
<memballoon model='virtio'/>
</devices>
</domain>

1
tests/qemuxmlconftest.c
View File

@ -1845,6 +1845,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("serial-unix-chardev");
DO_TEST_CAPS_LATEST_PARSE_ERROR("serial-unix-missing-source");
DO_TEST_CAPS_LATEST("serial-tcp-chardev");
DO_TEST_CAPS_LATEST_PARSE_ERROR("serial-tcp-chardev-telnets");
DO_TEST_CAPS_LATEST("serial-udp-chardev");
DO_TEST_CAPS_LATEST("serial-tcp-telnet-chardev");
driver.config->chardevTLS = 1;