External/libvirt
1
0
Fork 0
Code

qemu: Fix bandwidth memory leak on failure

Browse Source 
Detected by Coverity. Leaks introduced in commit e8d6b29.

Signed-off-by: Alex Jia <ajia@redhat.com>
This commit is contained in:
Alex Jia 2011-12-31 17:59:16 +08:00 committed by Eric Blake
parent 8267aea5a6
commit baade4cd2b
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/qemu/qemu_driver.c
View File

@ -7864,7 +7864,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
virDomainDefPtr persistentDef = NULL; virDomainDefPtr persistentDef = NULL;
int ret = -1; int ret = -1;
virDomainNetDefPtr net = NULL, persistentNet = NULL; virDomainNetDefPtr net = NULL, persistentNet = NULL;
virNetDevBandwidthPtr bandwidth = NULL; virNetDevBandwidthPtr bandwidth = NULL, newBandwidth = NULL;
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
VIR_DOMAIN_AFFECT_CONFIG, -1); VIR_DOMAIN_AFFECT_CONFIG, -1);
@ -7986,27 +7986,25 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
} }
if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (flags & VIR_DOMAIN_AFFECT_LIVE) {
virNetDevBandwidthPtr newBandwidth;
if (VIR_ALLOC(newBandwidth) < 0) { if (VIR_ALLOC(newBandwidth) < 0) {
virReportOOMError(); virReportOOMError();
goto cleanup; goto cleanup;
} }
memset(newBandwidth, 0, sizeof(newBandwidth));
/* virNetDevBandwidthSet() will clear any previous value of /* virNetDevBandwidthSet() will clear any previous value of
* bandwidth parameters, so merge with old bandwidth parameters * bandwidth parameters, so merge with old bandwidth parameters
* here to prevent them from losing. */ * here to prevent them from being lost. */
if (bandwidth->in || net->bandwidth->in) { if (bandwidth->in || net->bandwidth->in) {
if (VIR_ALLOC(newBandwidth->in) < 0) { if (VIR_ALLOC(newBandwidth->in) < 0) {
virReportOOMError(); virReportOOMError();
goto cleanup; goto cleanup;
} }
if (bandwidth->in) if (bandwidth->in)
memcpy(newBandwidth->in, bandwidth->in, sizeof(*newBandwidth->in)); memcpy(newBandwidth->in, bandwidth->in,
sizeof(*newBandwidth->in));
else if (net->bandwidth->in) else if (net->bandwidth->in)
memcpy(newBandwidth->in, net->bandwidth->in, sizeof(*newBandwidth->in)); memcpy(newBandwidth->in, net->bandwidth->in,
sizeof(*newBandwidth->in));
} }
if (bandwidth->out || net->bandwidth->out) { if (bandwidth->out || net->bandwidth->out) {
if (VIR_ALLOC(newBandwidth->out) < 0) { if (VIR_ALLOC(newBandwidth->out) < 0) {
@ -8014,9 +8012,11 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
goto cleanup; goto cleanup;
} }
if (bandwidth->out) if (bandwidth->out)
memcpy(newBandwidth->out, bandwidth->out, sizeof(*newBandwidth->out)); memcpy(newBandwidth->out, bandwidth->out,
sizeof(*newBandwidth->out));
else if (net->bandwidth->out) else if (net->bandwidth->out)
memcpy(newBandwidth->out, net->bandwidth->out, sizeof(*newBandwidth->out)); memcpy(newBandwidth->out, net->bandwidth->out,
sizeof(*newBandwidth->out));
} }
if (virNetDevBandwidthSet(net->ifname, newBandwidth) < 0) { if (virNetDevBandwidthSet(net->ifname, newBandwidth) < 0) {
@ -8053,6 +8053,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
ret = 0; ret = 0;
cleanup: cleanup:
virNetDevBandwidthFree(bandwidth); virNetDevBandwidthFree(bandwidth);
virNetDevBandwidthFree(newBandwidth);
virCgroupFree(&group); virCgroupFree(&group);
if (vm) if (vm)
virDomainObjUnlock(vm); virDomainObjUnlock(vm);