Commit-ID: 32a2253e55756503178fda8f6361aa4dd8f35917
Gitweb: http://git.kernel.org/tip/32a2253e55756503178fda8f6361aa4dd8f35917
Author: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
AuthorDate: Fri, 16 Dec 2011 17:12:00 +0800
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Sat, 17 Dec 2011 09:36:02 +0200
kvm-tools: Fix error path
don't closedir(NULL) and return 0 when dir == NULL
Acked-by: Sasha Levin <levinsasha928@xxxxxxxxx>
Signed-off-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/kvm.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c
index 7a745fb..192df63 100644
--- a/tools/kvm/kvm.c
+++ b/tools/kvm/kvm.c
@@ -209,8 +209,10 @@ int kvm__enumerate_instances(int (*callback)(const char *name, int fd))
sprintf(full_name, "%s", kvm__get_dir());
dir = opendir(full_name);
+ if (!dir)
+ return -1;
- while (dir != NULL) {
+ for (;;) {
readdir_r(dir, &entry, &result);
if (result == NULL)
break;
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|