kvm tools: Fix dirent handling on dirent non-friendly filesystems
Some filesystems don't return valid d_type field in dirent
structure (e.g XFS). So we must handle this case properly.
Signed-off-by: Milan Kocian <milon@wq.cz>
Cc: Sasha Levin <levinsasha928@gmail.com>
[ penberg@kernel.org: cleanups ]
Signed-off-by: Pekka Enberg <penberg@kernel.org>
diff --git a/kvm-ipc.c b/kvm-ipc.c
index 7897519..b1c43dd 100644
--- a/kvm-ipc.c
+++ b/kvm-ipc.c
@@ -112,14 +112,38 @@
return s;
}
+static bool is_socket(const char *base_path, const struct dirent *dent)
+{
+ switch (dent->d_type) {
+ case DT_SOCK:
+ return true;
+
+ case DT_UNKNOWN: {
+ char path[PATH_MAX];
+ struct stat st;
+
+ sprintf(path, "%s/%s", base_path, dent->d_name);
+ if (stat(path, &st))
+ return false;
+
+ return S_ISSOCK(st.st_mode);
+ }
+ default:
+ return false;
+ }
+}
+
int kvm__enumerate_instances(int (*callback)(const char *name, int fd))
{
int sock;
DIR *dir;
struct dirent entry, *result;
int ret = 0;
+ const char *path;
- dir = opendir(kvm__get_dir());
+ path = kvm__get_dir();
+
+ dir = opendir(path);
if (!dir)
return -errno;
@@ -127,7 +151,7 @@
readdir_r(dir, &entry, &result);
if (result == NULL)
break;
- if (entry.d_type == DT_SOCK) {
+ if (is_socket(path, &entry)) {
ssize_t name_len = strlen(entry.d_name);
char *p;
