提交 00b2317a 编写于 作者: P Peter Krempa

util: numa: Catch readdir errors in virNumaGetPages

Don't return possibly incomplete result if virDirRead fails.
上级 42d75b44
......@@ -728,6 +728,7 @@ virNumaGetPages(int node,
int ret = -1;
char *path = NULL;
DIR *dir = NULL;
int direrr;
struct dirent *entry;
unsigned int *tmp_size = NULL, *tmp_avail = NULL, *tmp_free = NULL;
unsigned int ntmp = 0;
......@@ -768,7 +769,7 @@ virNumaGetPages(int node,
goto cleanup;
}
while (virDirRead(dir, &entry, path) > 0) {
while ((direrr = virDirRead(dir, &entry, path)) > 0) {
const char *page_name = entry->d_name;
unsigned int page_size, page_avail = 0, page_free = 0;
char *end;
......@@ -805,6 +806,9 @@ virNumaGetPages(int node,
ntmp++;
}
if (direrr < 0)
goto cleanup;
/* Just to produce nice output, sort the arrays by increasing page size */
do {
exchange = false;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册