mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 21:55:25 +00:00
Don't leak memory if a cgroup is mounted multiple times
It is possible (expected/likely in Fedora 15) for a cgroup controller to be mounted in multiple locations at the same time, due to bind mounts. Currently we leak memory if this happens, because we overwrite the previous 'mountPoint' string. Instead just accept the first match we find. * src/util/cgroup.c: Only accept first match for a cgroup controller mount
This commit is contained in:
parent
cab55fa0a8
commit
c32536e7da
@ -131,7 +131,12 @@ static int virCgroupDetectMounts(virCgroupPtr group)
|
||||
} else {
|
||||
len = strlen(tmp);
|
||||
}
|
||||
/* NB, the same controller can appear >1 time in mount list
|
||||
* due to bind mounts from one location to another. Pick the
|
||||
* first entry only
|
||||
*/
|
||||
if (typelen == len && STREQLEN(typestr, tmp, len) &&
|
||||
!group->controllers[i].mountPoint &&
|
||||
!(group->controllers[i].mountPoint = strdup(entry.mnt_dir)))
|
||||
goto no_memory;
|
||||
tmp = next;
|
||||
|
Loading…
Reference in New Issue
Block a user