NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: avoid memory leak on vcpupin

Browse Source 
Detected by Coverity.  This leaked a cpumap on every iteration
of the loop.  Leak introduced in commit 1cc4d02 (v0.9.0).

* src/qemu/qemu_process.c (qemuProcessSetVcpuAffinites): Plug
leak, and hoist allocation outside loop.
This commit is contained in:
Eric Blake 2011-06-02 16:47:53 -06:00
parent c0e65ae5b2
commit 2834d57175
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/qemu/qemu_process.c
View File

@ -1195,6 +1195,8 @@ qemuProcessSetVcpuAffinites(virConnectPtr conn,
pid_t vcpupid; pid_t vcpupid;
unsigned char *cpumask; unsigned char *cpumask;
int vcpu, cpumaplen, hostcpus, maxcpu; int vcpu, cpumaplen, hostcpus, maxcpu;
unsigned char *cpumap = NULL;
int ret = -1;
if (virNodeGetInfo(conn, &nodeinfo) != 0) { if (virNodeGetInfo(conn, &nodeinfo) != 0) {
return -1; return -1;
@ -1216,18 +1218,18 @@ qemuProcessSetVcpuAffinites(virConnectPtr conn,
if (maxcpu > hostcpus) if (maxcpu > hostcpus)
maxcpu = hostcpus; maxcpu = hostcpus;
if (VIR_ALLOC_N(cpumap, cpumaplen) < 0) {
virReportOOMError();
return -1;
}
for (vcpu = 0; vcpu < def->cputune.nvcpupin; vcpu++) { for (vcpu = 0; vcpu < def->cputune.nvcpupin; vcpu++) {
if (vcpu != def->cputune.vcpupin[vcpu]->vcpuid) if (vcpu != def->cputune.vcpupin[vcpu]->vcpuid)
continue; continue;
int i; int i;
unsigned char *cpumap = NULL;
if (VIR_ALLOC_N(cpumap, cpumaplen) < 0) {
virReportOOMError();
return -1;
}
memset(cpumap, 0, cpumaplen);
cpumask = (unsigned char *)def->cputune.vcpupin[vcpu]->cpumask; cpumask = (unsigned char *)def->cputune.vcpupin[vcpu]->cpumask;
vcpupid = priv->vcpupids[vcpu]; vcpupid = priv->vcpupids[vcpu];
@ -1249,11 +1251,14 @@ qemuProcessSetVcpuAffinites(virConnectPtr conn,
cpumap, cpumap,
cpumaplen, cpumaplen,
maxcpu) < 0) { maxcpu) < 0) {
return -1; goto cleanup;
} }
} }
return 0; ret = 0;
cleanup:
VIR_FREE(cpumap);
return ret;
} }
static int static int