openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: Fix serial stub console allocation 

When adding the aliased serial stub console, the structure wasn't
properly allocated (VIR_ALLOC instead of virDomainChrDefNew) which then
resulted in SIGSEGV in virDomainChrSourceIsEqual during a serial device
coldplug.

https://bugzilla.redhat.com/show_bug.cgi?id=1434278

Signed-off-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Erik Skultety 2017-05-29 12:58:34 +02:00
parent 8e34f47813
commit ff6e94de60
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_hotplug.c
View File

@ -1802,15 +1802,17 @@ qemuDomainChrPreInsert(virDomainDefPtr vmdef,
if (virDomainChrPreAlloc(vmdef, chr) < 0) if (virDomainChrPreAlloc(vmdef, chr) < 0)
return -1; return -1;
/* Due to some crazy backcompat stuff, the first serial device is an alias /* Due to historical reasons, the first console is an alias to the
* to the first console too. If this is the case, the definition must be * first serial device (if such exists). If this is the case, we need to
* duplicated as first console device. */ * create an object for the first console as well.
*/
if (vmdef->nserials == 0 && vmdef->nconsoles == 0 && if (vmdef->nserials == 0 && vmdef->nconsoles == 0 &&
chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL) { chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL) {
if (!vmdef->consoles && VIR_ALLOC(vmdef->consoles) < 0) if (!vmdef->consoles && VIR_ALLOC(vmdef->consoles) < 0)
return -1; return -1;
if (VIR_ALLOC(vmdef->consoles[0]) < 0) { /* We'll be dealing with serials[0] directly, so NULL is fine here. */
if (!(vmdef->consoles[0] = virDomainChrDefNew(NULL))) {
VIR_FREE(vmdef->consoles); VIR_FREE(vmdef->consoles);
return -1; return -1;
} }
@ -1841,7 +1843,7 @@ qemuDomainChrInsertPreAllocCleanup(virDomainDefPtr vmdef,
/* Remove the stub console added by qemuDomainChrPreInsert */ /* Remove the stub console added by qemuDomainChrPreInsert */
if (vmdef->nserials == 0 && vmdef->nconsoles == 1 && if (vmdef->nserials == 0 && vmdef->nconsoles == 1 &&
chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL) { chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL) {
VIR_FREE(vmdef->consoles[0]); virDomainChrDefFree(vmdef->consoles[0]);
VIR_FREE(vmdef->consoles); VIR_FREE(vmdef->consoles);
vmdef->nconsoles = 0; vmdef->nconsoles = 0;
} }