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

qemu: cleanup error checking on agent replies

Browse Source 
On all the places where qemuAgentComand() was called, we did a check
for errors in the reply.  Unfortunately, some of the places called
qemuAgentCheckError() without checking for non-null reply which might
have resulted in a crash.

So this patch makes the error-checking part of qemuAgentCommand()
itself, which:

 a) makes it look better,

 b) makes the check mandatory and, most importantly,

 c) checks for the errors if and only if it is appropriate.

This actually fixes a potential crashers when qemuAgentComand()
returned 0, but reply was NULL.  Having said that, it *should* fix the
following bug:

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

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2014-04-01 14:58:56 +02:00
parent 17f826363d
commit 5b3492fadb
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/qemu/qemu_agent.c
View File

@ -117,6 +117,8 @@ struct _qemuAgent {
qemuAgentEvent await_event; qemuAgentEvent await_event;
}; };
static int qemuAgentCheckError(virJSONValuePtr cmd, virJSONValuePtr reply);
static virClassPtr qemuAgentClass; static virClassPtr qemuAgentClass;
static void qemuAgentDispose(void *obj); static void qemuAgentDispose(void *obj);
@ -1009,6 +1011,7 @@ qemuAgentCommand(qemuAgentPtr mon,
} }
} else { } else {
*reply = msg.rxObject; *reply = msg.rxObject;
ret = qemuAgentCheckError(cmd, *reply);
} }
} }
@ -1277,9 +1280,6 @@ int qemuAgentShutdown(qemuAgentPtr mon,
ret = qemuAgentCommand(mon, cmd, &reply, ret = qemuAgentCommand(mon, cmd, &reply,
VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK);
if (reply && ret == 0)
ret = qemuAgentCheckError(cmd, reply);
virJSONValueFree(cmd); virJSONValueFree(cmd);
virJSONValueFree(reply); virJSONValueFree(reply);
return ret; return ret;
@ -1308,8 +1308,7 @@ int qemuAgentFSFreeze(qemuAgentPtr mon)
return -1; return -1;
if (qemuAgentCommand(mon, cmd, &reply, if (qemuAgentCommand(mon, cmd, &reply,
VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0 || VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0)
qemuAgentCheckError(cmd, reply) < 0)
goto cleanup; goto cleanup;
if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) { if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) {
@ -1346,8 +1345,7 @@ int qemuAgentFSThaw(qemuAgentPtr mon)
return -1; return -1;
if (qemuAgentCommand(mon, cmd, &reply, if (qemuAgentCommand(mon, cmd, &reply,
VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0 || VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0)
qemuAgentCheckError(cmd, reply) < 0)
goto cleanup; goto cleanup;
if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) { if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) {
@ -1386,9 +1384,6 @@ qemuAgentSuspend(qemuAgentPtr mon,
ret = qemuAgentCommand(mon, cmd, &reply, ret = qemuAgentCommand(mon, cmd, &reply,
VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK);
if (reply && ret == 0)
ret = qemuAgentCheckError(cmd, reply);
virJSONValueFree(cmd); virJSONValueFree(cmd);
virJSONValueFree(reply); virJSONValueFree(reply);
return ret; return ret;
@ -1419,9 +1414,6 @@ qemuAgentArbitraryCommand(qemuAgentPtr mon,
if ((ret = qemuAgentCommand(mon, cmd, &reply, timeout)) < 0) if ((ret = qemuAgentCommand(mon, cmd, &reply, timeout)) < 0)
goto cleanup; goto cleanup;
if ((ret = qemuAgentCheckError(cmd, reply)) < 0)
goto cleanup;
if (!(*result = virJSONValueToString(reply, false))) if (!(*result = virJSONValueToString(reply, false)))
ret = -1; ret = -1;
@ -1449,9 +1441,6 @@ qemuAgentFSTrim(qemuAgentPtr mon,
ret = qemuAgentCommand(mon, cmd, &reply, ret = qemuAgentCommand(mon, cmd, &reply,
VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK);
if (reply && ret == 0)
ret = qemuAgentCheckError(cmd, reply);
virJSONValueFree(cmd); virJSONValueFree(cmd);
virJSONValueFree(reply); virJSONValueFree(reply);
return ret; return ret;
@ -1472,8 +1461,7 @@ qemuAgentGetVCPUs(qemuAgentPtr mon,
return -1; return -1;
if (qemuAgentCommand(mon, cmd, &reply, if (qemuAgentCommand(mon, cmd, &reply,
VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0 || VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0)
qemuAgentCheckError(cmd, reply) < 0)
goto cleanup; goto cleanup;
if (!(data = virJSONValueObjectGet(reply, "return"))) { if (!(data = virJSONValueObjectGet(reply, "return"))) {
@ -1581,8 +1569,7 @@ qemuAgentSetVCPUs(qemuAgentPtr mon,
cpus = NULL; cpus = NULL;
if (qemuAgentCommand(mon, cmd, &reply, if (qemuAgentCommand(mon, cmd, &reply,
VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0 || VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0)
qemuAgentCheckError(cmd, reply) < 0)
goto cleanup; goto cleanup;
if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) { if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) {