External/libvirt
1
0
Fork 0
Code

Report errors in virNodeCountThreadSiblings

Browse Source 
Use virFileReadAll which reports an error when the file is larger
than the specified maximum.

https://bugzilla.redhat.com/show_bug.cgi?id=1207849
This commit is contained in:
Ján Tomko 2015-06-02 14:24:03 +02:00
parent 815dc963ee
commit e37bcbd9b8
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/nodeinfo.c
View File

@ -344,7 +344,6 @@ virNodeCountThreadSiblings(const char *dir, unsigned int cpu)
{ {
unsigned long ret = 0; unsigned long ret = 0;
char *path; char *path;
FILE *pathfp;
char *str = NULL; char *str = NULL;
size_t i; size_t i;
@ -352,27 +351,16 @@ virNodeCountThreadSiblings(const char *dir, unsigned int cpu)
dir, cpu) < 0) dir, cpu) < 0)
return 0; return 0;
pathfp = fopen(path, "r"); if (!virFileExists(path)) {
if (pathfp == NULL) {
/* If file doesn't exist, then pretend our only /* If file doesn't exist, then pretend our only
* sibling is ourself */ * sibling is ourself */
if (errno == ENOENT) { ret = 1;
VIR_FREE(path);
return 1;
}
virReportSystemError(errno, _("cannot open %s"), path);
VIR_FREE(path);
return 0;
}
if (VIR_ALLOC_N(str, SYSFS_THREAD_SIBLINGS_LIST_LENGTH_MAX) < 0)
goto cleanup;
if (fgets(str, SYSFS_THREAD_SIBLINGS_LIST_LENGTH_MAX, pathfp) == NULL) {
virReportSystemError(errno, _("cannot read from %s"), path);
goto cleanup; goto cleanup;
} }
if (virFileReadAll(path, SYSFS_THREAD_SIBLINGS_LIST_LENGTH_MAX, &str) < 0)
goto cleanup;
i = 0; i = 0;
while (str[i] != '\0') { while (str[i] != '\0') {
if (c_isdigit(str[i])) if (c_isdigit(str[i]))
@ -386,9 +374,7 @@ virNodeCountThreadSiblings(const char *dir, unsigned int cpu)
cleanup: cleanup:
VIR_FREE(str); VIR_FREE(str);
VIR_FORCE_FCLOSE(pathfp);
VIR_FREE(path); VIR_FREE(path);
return ret; return ret;
} }