External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 13:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpc: fix memory leak in virNetServerClientNew and virNetServerProgramDispatchCall

Browse Source 
In virNetServerProgramDispatchCall, The arg is passed as a void*
and used to point to a certain struct depended on the dispatcher,
so I think it's the memory of the struct's member that leaks and
this memory shuld be freed by xdr_free.

In virNetServerClientNew, client->rx is assigned by invoking
virNetServerClientNew, but isn't freed if client->privateData's
initialization failed, which leads to a memory leak. Thanks to
Liang Peng's suggestion, put virNetMessageFree(client->rx) into
virNetServerClientDispose() to release the memory.

Signed-off-by: jiangjiacheng <jiangjiacheng@huawei.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
jiangjiacheng 2022-09-30 15:02:47 +08:00 committed by Michal Privoznik
parent 8802c38fd5
commit 41eb0f446c
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rpc/virnetserverclient.c
View File

@ -931,6 +931,8 @@ void virNetServerClientDispose(void *obj)
PROBE(RPC_SERVER_CLIENT_DISPOSE,
"client=%p", client);
if (client->rx)
virNetMessageFree(client->rx);
if (client->privateData)
client->privateDataFreeFunc(client->privateData);

22
src/rpc/virnetserverprogram.c
View File

@ -368,7 +368,7 @@ virNetServerProgramDispatchCall(virNetServerProgram *prog,
g_autofree char *arg = NULL;
g_autofree char *ret = NULL;
int rv = -1;
virNetServerProgramProc *dispatcher;
virNetServerProgramProc *dispatcher = NULL;
virNetMessageError rerr;
size_t i;
g_autoptr(virIdentity) identity = NULL;
@ -446,8 +446,6 @@ virNetServerProgramDispatchCall(virNetServerProgram *prog,
msg->nfds = 0;
}
xdr_free(dispatcher->arg_filter, arg);
if (rv < 0)
goto error;
@ -460,28 +458,28 @@ virNetServerProgramDispatchCall(virNetServerProgram *prog,
/*msg->header.serial = msg->header.serial;*/
msg->header.status = VIR_NET_OK;
if (virNetMessageEncodeHeader(msg) < 0) {
xdr_free(dispatcher->ret_filter, ret);
if (virNetMessageEncodeHeader(msg) < 0)
goto error;
}
if (msg->nfds &&
virNetMessageEncodeNumFDs(msg) < 0) {
xdr_free(dispatcher->ret_filter, ret);
virNetMessageEncodeNumFDs(msg) < 0)
goto error;
}
if (virNetMessageEncodePayload(msg, dispatcher->ret_filter, ret) < 0) {
xdr_free(dispatcher->ret_filter, ret);
if (virNetMessageEncodePayload(msg, dispatcher->ret_filter, ret) < 0)
goto error;
}
xdr_free(dispatcher->arg_filter, arg);
xdr_free(dispatcher->ret_filter, ret);
/* Put reply on end of tx queue to send out */
return virNetServerClientSendMessage(client, msg);
error:
if (dispatcher) {
xdr_free(dispatcher->arg_filter, arg);
xdr_free(dispatcher->ret_filter, ret);
}
/* Bad stuff (de-)serializing message, but we have an
* RPC error message we can send back to the client */
rv = virNetServerProgramSendReplyError(prog, client, msg, &rerr, &msg->header);