X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fconfig.c;h=8608faf980be0b8d988ea761051eb17c28ab2828;hb=8de4f9412d9681725c48f984c9e160773fdcf8c9;hp=a4b59ff0865e559e3f2dea86bbc8c3cc022bcec2;hpb=d324faf7d618feb0b209c8c7da497b244fa7046a;p=lttng-tools.git

diff --git a/src/common/config/config.c b/src/common/config/config.c
index a4b59ff08..8608faf98 100644
--- a/src/common/config/config.c
+++ b/src/common/config/config.c
@@ -2495,6 +2495,23 @@ end:
 	return ret;
 }
 
+/* Allocate dirent as recommended by READDIR(3), NOTES on readdir_r */
+static
+struct dirent *alloc_dirent(const char *path)
+{
+	size_t len;
+	long name_max;
+	struct dirent *entry;
+
+	name_max = pathconf(path, _PC_NAME_MAX);
+	if (name_max == -1) {
+		name_max = PATH_MAX;
+	}
+	len = offsetof(struct dirent, d_name) + name_max + 1;
+	entry = zmalloc(len);
+	return entry;
+}
+
 static
 int load_session_from_path(const char *path, const char *session_name,
 	struct session_config_validation_ctx *validation_ctx, int override)
@@ -2530,7 +2547,7 @@ int load_session_from_path(const char *path, const char *session_name,
 			goto end;
 		}
 
-		entry = zmalloc(sizeof(*entry));
+		entry = alloc_dirent(path);
 		if (!entry) {
 			ret = -LTTNG_ERR_NOMEM;
 			goto end;