External/libvirt
1
0
Fork 0
Code

cgroup: reuse buffer for getline

Browse Source 
Reuse the buffer for getline and track buffer allocation
separately from the string length to prevent unlikely
out-of-bounds memory access.

This fixes the following leak that happened when zero bytes were read:

==404== 120 bytes in 1 blocks are definitely lost in loss record 1,344 of 1,671
==404==    at 0x4C2C71B: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==404==    by 0x906F862: getdelim (iogetdelim.c:68)
==404==    by 0x52A48FB: virCgroupPartitionNeedsEscaping (vircgroup.c:1136)
==404==    by 0x52A0FB4: virCgroupPartitionEscape (vircgroup.c:1171)
==404==    by 0x52A0EA4: virCgroupNewDomainPartition (vircgroup.c:1450)
This commit is contained in:
Ján Tomko 2013-07-17 10:56:05 +02:00
parent e80e07f657
commit cc7329317f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/util/vircgroup.c
View File

@ -1101,7 +1101,7 @@ static int virCgroupPartitionNeedsEscaping(const char *path)
FILE *fp = NULL; FILE *fp = NULL;
int ret = 0; int ret = 0;
char *line = NULL; char *line = NULL;
size_t len; size_t buflen;
/* If it starts with 'cgroup.' or a '_' of any /* If it starts with 'cgroup.' or a '_' of any
* of the controller names from /proc/cgroups, * of the controller names from /proc/cgroups,
@ -1133,23 +1133,22 @@ static int virCgroupPartitionNeedsEscaping(const char *path)
* freezer 6 4 1 * freezer 6 4 1
* net_cls 7 1 1 * net_cls 7 1 1
*/ */
while (getline(&line, &len, fp) > 0) { while (getline(&line, &buflen, fp) > 0) {
if (STRPREFIX(line, "#subsys_name")) { char *tmp;
VIR_FREE(line); size_t len;
if (STRPREFIX(line, "#subsys_name"))
continue; continue;
}
char *tmp = strchr(line, ' '); tmp = strchrnul(line, ' ');
if (tmp) *tmp = '\0';
*tmp = '\0';
len = tmp - line; len = tmp - line;
if (STRPREFIX(path, line) && if (STRPREFIX(path, line) &&
path[len] == '.') { path[len] == '.') {
ret = 1; ret = 1;
VIR_FREE(line);
goto cleanup; goto cleanup;
} }
VIR_FREE(line);
} }
if (ferror(fp)) { if (ferror(fp)) {
@ -1158,6 +1157,7 @@ static int virCgroupPartitionNeedsEscaping(const char *path)
} }
cleanup: cleanup:
VIR_FREE(line);
VIR_FORCE_FCLOSE(fp); VIR_FORCE_FCLOSE(fp);
return ret; return ret;
} }