External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

cgroup: fix libvirtd crash caused by messed memory

Browse Source 
The variable max_id is initialized again in the step of
getting cpu mapping variable map2. But in the next for loop
we still expect original value of max_id, the bug will
crash libvirtd when using on NUMA machine with big number
of cpus.
This commit is contained in:
Guannan Ren 2012-08-31 16:45:02 +08:00
parent 657fef1401
commit fccab89def
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/qemu/qemu_driver.c
View File

@ -13496,7 +13496,7 @@ qemuDomainGetPercpuStats(virDomainPtr domain,
char *map = NULL;
char *map2 = NULL;
int rv = -1;
int i, max_id;
int i, id, max_id;
char *pos;
char *buf = NULL;
unsigned long long *sum_cpu_time = NULL;
@ -13537,10 +13537,13 @@ qemuDomainGetPercpuStats(virDomainPtr domain,
/* return percpu cputime in index 0 */
param_idx = 0;
if (max_id - start_cpu > ncpus - 1)
max_id = start_cpu + ncpus - 1;
/* number of cpus to compute */
id = max_id;
for (i = 0; i <= max_id; i++) {
if (max_id - start_cpu > ncpus - 1)
id = start_cpu + ncpus - 1;
for (i = 0; i <= id; i++) {
if (!map[i]) {
cpu_time = 0;
} else if (virStrToLong_ull(pos, &pos, 10, &cpu_time) < 0) {
@ -13580,7 +13583,7 @@ qemuDomainGetPercpuStats(virDomainPtr domain,
}
sum_cpu_pos = sum_cpu_time;
for (i = 0; i <= max_id; i++) {
for (i = 0; i <= id; i++) {
if (!map[i])
cpu_time = 0;
else