External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

xenconfig: fix handling of NULL disk source

Browse Source 
It is possible to crash libvirtd when converting xl native config to
domXML when the xl config contains an empty disk source, e.g. an empty
CDROM. Fix by checking that the disk source is non-NULL before parsing it.

Signed-off-by: Wim ten Have <wim.ten.have@oracle.com>
This commit is contained in:
Wim ten Have 2017-05-19 16:38:43 +02:00 committed by Jim Fehlig
parent 2f69dd36bb
commit 4cd3f24139
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xenconfig/xen_xl.c
View File

@ -316,6 +316,10 @@ xenParseXLDiskSrc(virDomainDiskDefPtr disk, char *srcstr)
char *tmpstr = NULL; char *tmpstr = NULL;
int ret = -1; int ret = -1;
/* A NULL source is valid, e.g. an empty CDROM */
if (srcstr == NULL)
return 0;
if (STRPREFIX(srcstr, "rbd:")) { if (STRPREFIX(srcstr, "rbd:")) {
if (!(tmpstr = virStringReplace(srcstr, "\\\\", "\\"))) if (!(tmpstr = virStringReplace(srcstr, "\\\\", "\\")))
goto cleanup; goto cleanup;

2
tests/xlconfigdata/test-disk-positional-parms-partial.cfg
View File

@ -22,4 +22,4 @@ parallel = "none"
serial = "none" serial = "none"
builder = "hvm" builder = "hvm"
boot = "d" boot = "d"
disk = [ "/dev/HostVG/XenGuest2,,hda,,backendtype=phy", "/var/lib/libvirt/images/XenGuest2-home,,hdb,,", "/root/boot.iso,,hdc,,devtype=cdrom" ] disk = [ "/dev/HostVG/XenGuest2,,hda,,backendtype=phy", "/var/lib/libvirt/images/XenGuest2-home,,hdb,,", "/root/boot.iso,,hdc,,devtype=cdrom" , "format=raw,vdev=hdd,access=ro,devtype=cdrom" ]

6
tests/xlconfigdata/test-disk-positional-parms-partial.xml
View File

@ -39,6 +39,12 @@
<readonly/> <readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/> <address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk> </disk>
<disk type='file' device='cdrom'>
<driver name='qemu' type='raw'/>
<target dev='hdd' bus='ide'/>
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='1'/>
</disk>
<controller type='ide' index='0'/> <controller type='ide' index='0'/>
<interface type='bridge'> <interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/> <mac address='00:16:3e:66:92:9c'/>