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

vbox: fix SEGV during dumpxml of a serial port

Browse Source 
commit 77a12987a48 changed the "virDomainChrSourceDef source" inside
virDomainChrDef to "virDomainChrSourceDefPtr source", and started
allocating source inside virDomainChrDefNew(), but vboxDumpSerial()
was allocating a virDomainChrDef with a simple VIR_ALLOC() (i.e. never
calling virDomainChrDefNew()), so source was never initialized,
leading to a SEGV any time a serial port was present. The same problem
was created in vboxDumpParallel().

This patch changes vboxDumpSerial() and vboxDumpParallel() to use
virDomainChrDefNew() instead of VIR_ALLOC(), and changes both of those
functions to return an error if virDomainChrDef() (or any other
allocation) fails.

This resolves: https://bugzilla.redhat.com/1536649
This commit is contained in:
Laine Stump 2018-01-20 21:11:05 -05:00
parent 5866f48673
commit 9c27e464e3
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/vbox/vbox_common.c
View File

@ -3862,7 +3862,7 @@ vboxDumpAudio(virDomainDefPtr def, vboxDriverPtr data ATTRIBUTE_UNUSED,
} }
} }
static void static int
vboxDumpSerial(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUint32 serialPortCount) vboxDumpSerial(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUint32 serialPortCount)
{ {
PRUint32 serialPortIncCount = 0; PRUint32 serialPortIncCount = 0;
@ -3886,9 +3886,15 @@ vboxDumpSerial(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUin
} }
/* Allocate memory for the serial ports which are enabled */ /* Allocate memory for the serial ports which are enabled */
if ((def->nserials > 0) && (VIR_ALLOC_N(def->serials, def->nserials) >= 0)) { if (def->nserials > 0) {
for (i = 0; i < def->nserials; i++) if (VIR_ALLOC_N(def->serials, def->nserials) < 0)
ignore_value(VIR_ALLOC(def->serials[i])); return -1;
for (i = 0; i < def->nserials; i++) {
def->serials[i] = virDomainChrDefNew(NULL);
if (!def->serials[i])
return -1;
}
} }
/* Now get the details about the serial ports here */ /* Now get the details about the serial ports here */
@ -3936,7 +3942,8 @@ vboxDumpSerial(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUin
if (pathUtf16) { if (pathUtf16) {
VBOX_UTF16_TO_UTF8(pathUtf16, &path); VBOX_UTF16_TO_UTF8(pathUtf16, &path);
ignore_value(VIR_STRDUP(def->serials[serialPortIncCount]->source->data.file.path, path)); if (VIR_STRDUP(def->serials[serialPortIncCount]->source->data.file.path, path) < 0)
return -1;
} }
serialPortIncCount++; serialPortIncCount++;
@ -3948,9 +3955,10 @@ vboxDumpSerial(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUin
VBOX_RELEASE(serialPort); VBOX_RELEASE(serialPort);
} }
} }
return 0;
} }
static void static int
vboxDumpParallel(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUint32 parallelPortCount) vboxDumpParallel(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRUint32 parallelPortCount)
{ {
PRUint32 parallelPortIncCount = 0; PRUint32 parallelPortIncCount = 0;
@ -3974,9 +3982,15 @@ vboxDumpParallel(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRU
} }
/* Allocate memory for the parallel ports which are enabled */ /* Allocate memory for the parallel ports which are enabled */
if ((def->nparallels > 0) && (VIR_ALLOC_N(def->parallels, def->nparallels) >= 0)) { if (def->nparallels > 0) {
for (i = 0; i < def->nparallels; i++) if (VIR_ALLOC_N(def->parallels, def->nparallels) < 0)
ignore_value(VIR_ALLOC(def->parallels[i])); return -1;
for (i = 0; i < def->nparallels; i++) {
def->parallels[i] = virDomainChrDefNew(NULL);
if (!def->parallels[i])
return -1;
}
} }
/* Now get the details about the parallel ports here */ /* Now get the details about the parallel ports here */
@ -4011,7 +4025,8 @@ vboxDumpParallel(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRU
gVBoxAPI.UIParallelPort.GetPath(parallelPort, &pathUtf16); gVBoxAPI.UIParallelPort.GetPath(parallelPort, &pathUtf16);
VBOX_UTF16_TO_UTF8(pathUtf16, &path); VBOX_UTF16_TO_UTF8(pathUtf16, &path);
ignore_value(VIR_STRDUP(def->parallels[parallelPortIncCount]->source->data.file.path, path)); if (VIR_STRDUP(def->parallels[parallelPortIncCount]->source->data.file.path, path) < 0)
return -1;
parallelPortIncCount++; parallelPortIncCount++;
@ -4022,6 +4037,7 @@ vboxDumpParallel(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine, PRU
VBOX_RELEASE(parallelPort); VBOX_RELEASE(parallelPort);
} }
} }
return 0;
} }
static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
@ -4162,8 +4178,11 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags)
vboxDumpSharedFolders(def, data, machine); vboxDumpSharedFolders(def, data, machine);
vboxDumpNetwork(def, data, machine, networkAdapterCount); vboxDumpNetwork(def, data, machine, networkAdapterCount);
vboxDumpAudio(def, data, machine); vboxDumpAudio(def, data, machine);
vboxDumpSerial(def, data, machine, serialPortCount);
vboxDumpParallel(def, data, machine, parallelPortCount); if (vboxDumpSerial(def, data, machine, serialPortCount) < 0)
goto cleanup;
if (vboxDumpParallel(def, data, machine, parallelPortCount) < 0)
goto cleanup;
/* dump USB devices/filters if active */ /* dump USB devices/filters if active */
vboxHostDeviceGetXMLDesc(data, def, machine); vboxHostDeviceGetXMLDesc(data, def, machine);