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

qemu: Move qemuAgentFSInfo array free into qemuDomainGetFSInfo()

Browse Source 
When qemuDomainGetFSInfo() is called it calls
qemuDomainGetFSInfoAgent() which executes 'guest-get-fsinfo'
guest agent command, parses returned JSON and returns an array of
qemuAgentFSInfo structures (well, pointers to those structs).
Then it grabs a domain job and tries to do some matching of guest
returned info against domain definition. This matching is done in
virDomainFSInfoFormat() which also frees the array of
qemuAgentFSInfo structures allocated earlier.

But this is not just. If acquiring the domain job fails (or
domain activeness check executed right after that fails) then
virDomainFSInfoFormat() is not called, leaking the array of
structs.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2021-02-16 11:27:56 +01:00
parent 5922b2b104
commit 59c80e9fd0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_driver.c
View File

@ -18978,7 +18978,6 @@ virDomainFSInfoFormat(qemuAgentFSInfoPtr *agentinfo,
cleanup:
for (i = 0; i < nagentinfo; i++) {
qemuAgentFSInfoFree(agentinfo[i]);
/* if there was an error, free any memory we've allocated for the
* return value */
if (info_ret)
@ -18997,7 +18996,7 @@ qemuDomainGetFSInfo(virDomainPtr dom,
virDomainObjPtr vm;
qemuAgentFSInfoPtr *agentinfo = NULL;
int ret = -1;
int nfs;
int nfs = 0;
virCheckFlags(0, ret);
@ -19022,7 +19021,12 @@ qemuDomainGetFSInfo(virDomainPtr dom,
qemuDomainObjEndJob(driver, vm);
cleanup:
g_free(agentinfo);
if (agentinfo) {
size_t i;
for (i = 0; i < nfs; i++)
qemuAgentFSInfoFree(agentinfo[i]);
g_free(agentinfo);
}
virDomainObjEndAPI(&vm);
return ret;
}