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

Fix release of virNetMessagePtr instances in streams processing

Browse Source 
If a message packet for a invalid stream is received it is just
free'd. This is not good because it doesn't let the client RPC
request counter decrement. If a stream is shutdown with pending
packets the message also isn't released properly because of an
incorrect header type

* daemon/stream.c: Fix message header type
* src/rpc/virnetserverprogram.c: Send dummy reply instead of
  free'ing ignored stream message
This commit is contained in:
Daniel P. Berrange 2011-06-30 16:40:47 +01:00
parent f1c2c0e2dc
commit c69ba67032
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
daemon/stream.c
View File

@ -327,6 +327,7 @@ int daemonFreeClientStream(virNetServerClientPtr client,
virNetMessagePtr tmp = msg->next; virNetMessagePtr tmp = msg->next;
/* Send a dummy reply to free up 'msg' & unblock client rx */ /* Send a dummy reply to free up 'msg' & unblock client rx */
memset(msg, 0, sizeof(*msg)); memset(msg, 0, sizeof(*msg));
msg->header.type = VIR_NET_REPLY;
if (virNetServerClientSendMessage(client, msg) < 0) { if (virNetServerClientSendMessage(client, msg) < 0) {
virNetServerClientMarkClose(client); virNetServerClientMarkClose(client);
virNetMessageFree(msg); virNetMessageFree(msg);

9
src/rpc/virnetserverprogram.c
View File

@ -259,7 +259,13 @@ int virNetServerProgramDispatch(virNetServerProgramPtr prog,
*/ */
VIR_INFO("Ignoring unexpected stream data serial=%d proc=%d status=%d", VIR_INFO("Ignoring unexpected stream data serial=%d proc=%d status=%d",
msg->header.serial, msg->header.proc, msg->header.status); msg->header.serial, msg->header.proc, msg->header.status);
virNetMessageFree(msg); /* Send a dummy reply to free up 'msg' & unblock client rx */
memset(msg, 0, sizeof(*msg));
msg->header.type = VIR_NET_REPLY;
if (virNetServerClientSendMessage(client, msg) < 0) {
ret = -1;
goto cleanup;
}
ret = 0; ret = 0;
break; break;
@ -275,6 +281,7 @@ int virNetServerProgramDispatch(virNetServerProgramPtr prog,
error: error:
ret = virNetServerProgramSendReplyError(prog, client, msg, &rerr, &msg->header); ret = virNetServerProgramSendReplyError(prog, client, msg, &rerr, &msg->header);
cleanup:
return ret; return ret;
} }