External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

vcpupin: Fix returning of arrays from virDomainVcpuPinAdd

Browse Source 
virDomainVcpuPinAdd does a realloc on vcpupin_list if the new vcpu pin
definition doesn't fit into the array. The list is an array of pointers
but the function definition didn't support returning the changed pointer
to the caller if it was realloced. This caused segfaults if realloc
would change the base pointer.
This commit is contained in:
Peter Krempa 2012-08-30 15:38:37 +02:00
parent 40dfb52517
commit 077e7bf51f
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf/domain_conf.c
View File

@ -11037,7 +11037,7 @@ cleanup:
return bitmap; return bitmap;
} }
int virDomainVcpuPinAdd(virDomainVcpuPinDefPtr *vcpupin_list, int virDomainVcpuPinAdd(virDomainVcpuPinDefPtr **vcpupin_list,
int *nvcpupin, int *nvcpupin,
unsigned char *cpumap, unsigned char *cpumap,
int maplen, int maplen,
@ -11052,7 +11052,7 @@ int virDomainVcpuPinAdd(virDomainVcpuPinDefPtr *vcpupin_list,
if ((cpumask = bitmapFromBytemap(cpumap, maplen)) == NULL) if ((cpumask = bitmapFromBytemap(cpumap, maplen)) == NULL)
return -1; return -1;
vcpupin = virDomainVcpuPinFindByVcpu(vcpupin_list, vcpupin = virDomainVcpuPinFindByVcpu(*vcpupin_list,
*nvcpupin, *nvcpupin,
vcpu); vcpu);
if (vcpupin) { if (vcpupin) {
@ -11073,14 +11073,14 @@ int virDomainVcpuPinAdd(virDomainVcpuPinDefPtr *vcpupin_list,
vcpupin->cpumask = cpumask; vcpupin->cpumask = cpumask;
if (VIR_REALLOC_N(vcpupin_list, *nvcpupin + 1) < 0) { if (VIR_REALLOC_N(*vcpupin_list, *nvcpupin + 1) < 0) {
virReportOOMError(); virReportOOMError();
VIR_FREE(cpumask); VIR_FREE(cpumask);
VIR_FREE(vcpupin); VIR_FREE(vcpupin);
return -1; return -1;
} }
vcpupin_list[(*nvcpupin)++] = vcpupin; (*vcpupin_list)[(*nvcpupin)++] = vcpupin;
return 0; return 0;
} }

2
src/conf/domain_conf.h
View File

@ -1885,7 +1885,7 @@ int virDomainCpuSetParse(const char *str,
char *virDomainCpuSetFormat(char *cpuset, char *virDomainCpuSetFormat(char *cpuset,
int maxcpu); int maxcpu);
int virDomainVcpuPinAdd(virDomainVcpuPinDefPtr *vcpupin_list, int virDomainVcpuPinAdd(virDomainVcpuPinDefPtr **vcpupin_list,
int *nvcpupin, int *nvcpupin,
unsigned char *cpumap, unsigned char *cpumap,
int maplen, int maplen,

2
src/libxl/libxl_driver.c
View File

@ -2461,7 +2461,7 @@ libxlDomainPinVcpu(virDomainPtr dom, unsigned int vcpu, unsigned char *cpumap,
} }
vm->def->cputune.nvcpupin = 0; vm->def->cputune.nvcpupin = 0;
} }
if (virDomainVcpuPinAdd(vm->def->cputune.vcpupin, if (virDomainVcpuPinAdd(&vm->def->cputune.vcpupin,
&vm->def->cputune.nvcpupin, &vm->def->cputune.nvcpupin,
cpumap, cpumap,
maplen, maplen,

6
src/qemu/qemu_driver.c
View File

@ -3782,7 +3782,7 @@ qemudDomainPinVcpuFlags(virDomainPtr dom,
newVcpuPinNum = 0; newVcpuPinNum = 0;
} }
if (virDomainVcpuPinAdd(newVcpuPin, &newVcpuPinNum, cpumap, maplen, vcpu) < 0) { if (virDomainVcpuPinAdd(&newVcpuPin, &newVcpuPinNum, cpumap, maplen, vcpu) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("failed to update vcpupin")); _("failed to update vcpupin"));
virDomainVcpuPinDefFree(newVcpuPin, newVcpuPinNum); virDomainVcpuPinDefFree(newVcpuPin, newVcpuPinNum);
@ -3849,7 +3849,7 @@ qemudDomainPinVcpuFlags(virDomainPtr dom,
} }
persistentDef->cputune.nvcpupin = 0; persistentDef->cputune.nvcpupin = 0;
} }
if (virDomainVcpuPinAdd(persistentDef->cputune.vcpupin, if (virDomainVcpuPinAdd(&persistentDef->cputune.vcpupin,
&persistentDef->cputune.nvcpupin, &persistentDef->cputune.nvcpupin,
cpumap, cpumap,
maplen, maplen,
@ -4042,7 +4042,7 @@ qemudDomainPinEmulator(virDomainPtr dom,
newVcpuPinNum = 0; newVcpuPinNum = 0;
} }
if (virDomainVcpuPinAdd(newVcpuPin, &newVcpuPinNum, cpumap, maplen, -1) < 0) { if (virDomainVcpuPinAdd(&newVcpuPin, &newVcpuPinNum, cpumap, maplen, -1) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("failed to update vcpupin")); _("failed to update vcpupin"));
virDomainVcpuPinDefFree(newVcpuPin, newVcpuPinNum); virDomainVcpuPinDefFree(newVcpuPin, newVcpuPinNum);

2
src/xen/xend_internal.c
View File

@ -2303,7 +2303,7 @@ xenDaemonDomainPinVcpu(virDomainPtr domain, unsigned int vcpu,
} }
def->cputune.nvcpupin = 0; def->cputune.nvcpupin = 0;
} }
if (virDomainVcpuPinAdd(def->cputune.vcpupin, if (virDomainVcpuPinAdd(&def->cputune.vcpupin,
&def->cputune.nvcpupin, &def->cputune.nvcpupin,
cpumap, cpumap,
maplen, maplen,