X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsave.c;h=0c91239931ad6125049687ea411fad8c52bddea7;hp=2d8af38217754916ea7080dba0604f479c88027a;hb=d2992717e6c3df45a80c8529e50ab18b4415a0ac;hpb=dfe338611a5ccfa544186c3539fef278c8289080

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index 2d8af3821..0c9123993 100644
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -1419,7 +1419,7 @@ int save_session(struct ltt_session *session,
 	provided_path = lttng_save_session_attr_get_output_url(attr);
 	if (provided_path) {
 		len = strlen(provided_path);
-		if (len > PATH_MAX) {
+		if (len >= sizeof(config_file_path)) {
 			ret = LTTNG_ERR_SET_URL;
 			goto end;
 		}
@@ -1433,7 +1433,7 @@ int save_session(struct ltt_session *session,
 			goto end;
 		}
 
-		ret_len = snprintf(config_file_path, PATH_MAX,
+		ret_len = snprintf(config_file_path, sizeof(config_file_path),
 				DEFAULT_SESSION_HOME_CONFIGPATH, home_dir);
 		free(home_dir);
 		if (ret_len < 0) {
@@ -1445,11 +1445,12 @@ int save_session(struct ltt_session *session,
 	}
 
 	/*
-	 * Check the path fits in PATH_MAX, including the / followed by trailing
-	 * .lttng extension and the NULL terminated string.
+	 * Check the path fits in the config file path dst including the '/'
+	 * followed by trailing .lttng extension and the NULL terminated string.
 	 */
-	if (len + session_name_len + 2 +
-			sizeof(DEFAULT_SESSION_CONFIG_FILE_EXTENSION) > PATH_MAX) {
+	if ((len + session_name_len + 2 +
+			sizeof(DEFAULT_SESSION_CONFIG_FILE_EXTENSION))
+			> sizeof(config_file_path)) {
 		ret = LTTNG_ERR_SET_URL;
 		goto end;
 	}
@@ -1461,6 +1462,10 @@ int save_session(struct ltt_session *session,
 		goto end;
 	}
 
+	/*
+	 * At this point, we know that everything fits in the buffer. Validation
+	 * was done just above.
+	 */
 	config_file_path[len++] = '/';
 	strncpy(config_file_path + len, session->name, session_name_len);
 	len += session_name_len;