openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemuBuildSevCommandLine: fix buffer leak 

The buffer is not freed anywhere. Nor in the error paths. Also
the usage virCommand with respect to buffer is very odd.

==2504== 1,100 bytes in 1 blocks are definitely lost in loss record 167 of 175
==2504==    at 0x4C2CE3F: malloc (vg_replace_malloc.c:298)
==2504==    by 0x4C2F1BF: realloc (vg_replace_malloc.c:785)
==2504==    by 0x5D32EE2: virReallocN (viralloc.c:245)
==2504==    by 0x5D37278: virBufferGrow (virbuffer.c:150)
==2504==    by 0x5D3783E: virBufferVasprintf (virbuffer.c:408)
==2504==    by 0x5D377A9: virBufferAsprintf (virbuffer.c:381)
==2504==    by 0x57017C1: qemuBuildSevCommandLine (qemu_command.c:9707)
==2504==    by 0x57030F7: qemuBuildCommandLine (qemu_command.c:10324)
==2504==    by 0x575FA48: qemuProcessCreatePretendCmd (qemu_process.c:6644)
==2504==    by 0x11351A: testCompareXMLToArgv (qemuxml2argvtest.c:564)
==2504==    by 0x1392F7: virTestRun (testutils.c:180)
==2504==    by 0x137895: mymain (qemuxml2argvtest.c:2900)

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2018-06-13 12:33:57 +02:00
parent c92c6cd2f9
commit 84e4046cd7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/qemu/qemu_command.c
View File

@ -9697,6 +9697,7 @@ qemuBuildSevCommandLine(virDomainObjPtr vm, virCommandPtr cmd,
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
char *path = NULL; char *path = NULL;
int ret = -1;
if (!sev) if (!sev)
return 0; return 0;
@ -9710,20 +9711,24 @@ qemuBuildSevCommandLine(virDomainObjPtr vm, virCommandPtr cmd,
if (sev->dh_cert) { if (sev->dh_cert) {
if (virAsprintf(&path, "%s/dh_cert.base64", priv->libDir) < 0) if (virAsprintf(&path, "%s/dh_cert.base64", priv->libDir) < 0)
return -1; goto cleanup;
virBufferAsprintf(&buf, ",dh-cert-file=%s", path); virBufferAsprintf(&buf, ",dh-cert-file=%s", path);
VIR_FREE(path); VIR_FREE(path);
} }
if (sev->session) { if (sev->session) {
if (virAsprintf(&path, "%s/session.base64", priv->libDir) < 0) if (virAsprintf(&path, "%s/session.base64", priv->libDir) < 0)
return -1; goto cleanup;
virBufferAsprintf(&buf, ",session-file=%s", path); virBufferAsprintf(&buf, ",session-file=%s", path);
VIR_FREE(path); VIR_FREE(path);
} }
virCommandAddArgList(cmd, "-object", virBufferContentAndReset(&buf), NULL); virCommandAddArg(cmd, "-object");
return 0; virCommandAddArgBuffer(cmd, &buf);
ret = 0;
cleanup:
virBufferFreeAndReset(&buf);
return ret;
} }
static int static int