ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration/rdma: cleanup rdma context before g_free to avoid memleaks 

When error happen in initializing 'rdma_return_path', we should cleanup rdma context
before g_free(rdma) to avoid some memleaks. This patch fix that.

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
Message-Id: <20200508100755.7875-3-pannengyuan@huawei.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Pan Nengyuan 2020-05-08 06:07:55 -04:00 committed by Dr. David Alan Gilbert
parent 3b59ee7227
commit 2f0c285aaa
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
migration/rdma.c
View File

@ -4094,20 +4094,20 @@ void rdma_start_outgoing_migration(void *opaque,
rdma_return_path = qemu_rdma_data_init(host_port, errp); rdma_return_path = qemu_rdma_data_init(host_port, errp);
if (rdma_return_path == NULL) { if (rdma_return_path == NULL) {
goto err; goto return_path_err;
} }
ret = qemu_rdma_source_init(rdma_return_path, ret = qemu_rdma_source_init(rdma_return_path,
s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp); s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp);
if (ret) { if (ret) {
goto err; goto return_path_err;
} }
ret = qemu_rdma_connect(rdma_return_path, errp); ret = qemu_rdma_connect(rdma_return_path, errp);
if (ret) { if (ret) {
goto err; goto return_path_err;
} }
rdma->return_path = rdma_return_path; rdma->return_path = rdma_return_path;
@ -4120,6 +4120,8 @@ void rdma_start_outgoing_migration(void *opaque,
s->to_dst_file = qemu_fopen_rdma(rdma, "wb"); s->to_dst_file = qemu_fopen_rdma(rdma, "wb");
migrate_fd_connect(s, NULL); migrate_fd_connect(s, NULL);
return; return;
return_path_err:
qemu_rdma_cleanup(rdma);
err: err:
g_free(rdma); g_free(rdma);
g_free(rdma_return_path); g_free(rdma_return_path);