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

qemuDomainGetGuestInfo: Don't try to free a negative number of entries 

'nfs' variable was set to -1 or -2 on agent failure. Cleanup then tried
to free 'nfs' elements of the array which resulted into a crash.

Make 'nfs' size_t and assign it only on successful agent call.

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

Broken by commit 599ae372d8

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-03-12 16:37:11 +01:00
parent da1b193227
commit 0fdb7385e4
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_agent.c
View File

@ -1941,7 +1941,7 @@ qemuAgentGetFSInfoFillDisks(virJSONValuePtr jsondisks,
return 0;
}
/* Returns: 0 on success
/* Returns: number of entries in '@info' on success
* -2 when agent command is not supported by the agent
* -1 otherwise
*/

12
src/qemu/qemu_driver.c
View File

@ -22814,7 +22814,7 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
g_autofree char *hostname = NULL;
unsigned int supportedTypes = types;
int rc;
int nfs = 0;
size_t nfs = 0;
qemuAgentFSInfoPtr *agentfsinfo = NULL;
size_t i;
@ -22867,9 +22867,13 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
}
}
if (supportedTypes & VIR_DOMAIN_GUEST_INFO_FILESYSTEM) {
rc = nfs = qemuAgentGetFSInfo(agent, &agentfsinfo);
if (rc < 0 && !(rc == -2 && types == 0))
goto exitagent;
rc = qemuAgentGetFSInfo(agent, &agentfsinfo);
if (rc < 0) {
if (!(rc == -2 && types == 0))
goto exitagent;
} else {
nfs = rc;
}
}
ret = 0;