提交 0fdb7385 编写于 作者: P Peter Krempa

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 599ae372Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 da1b1932
......@@ -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
*/
......
......@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册