X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsave.c;h=6c7ca6757ea4cf9bbf9dd936dd2e141c91fc683e;hp=ce9f2f9ff1772910ac5ce1a1b3b8023e566214c9;hb=f17b873261bab722b58f21aabd3fcb44a0bbc20d;hpb=e32d7f274604b77bcd83c24994e88df3761ed658

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index ce9f2f9ff..6c7ca6757 100644
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -294,6 +294,27 @@ const char *get_kernel_context_type_string(
 	case LTTNG_KERNEL_CONTEXT_CALLSTACK_KERNEL:
 		context_type_string = config_event_context_callstack_kernel;
 		break;
+	case LTTNG_KERNEL_CONTEXT_CGROUP_NS:
+		context_type_string = config_event_context_cgroup_ns;
+		break;
+	case LTTNG_KERNEL_CONTEXT_IPC_NS:
+		context_type_string = config_event_context_ipc_ns;
+		break;
+	case LTTNG_KERNEL_CONTEXT_MNT_NS:
+		context_type_string = config_event_context_mnt_ns;
+		break;
+	case LTTNG_KERNEL_CONTEXT_NET_NS:
+		context_type_string = config_event_context_net_ns;
+		break;
+	case LTTNG_KERNEL_CONTEXT_PID_NS:
+		context_type_string = config_event_context_pid_ns;
+		break;
+	case LTTNG_KERNEL_CONTEXT_USER_NS:
+		context_type_string = config_event_context_user_ns;
+		break;
+	case LTTNG_KERNEL_CONTEXT_UTS_NS:
+		context_type_string = config_event_context_uts_ns;
+		break;
 	default:
 		context_type_string = NULL;
 	}
@@ -326,6 +347,27 @@ const char *get_ust_context_type_string(
 	case LTTNG_UST_CONTEXT_APP_CONTEXT:
 		context_type_string = config_event_context_app;
 		break;
+	case LTTNG_UST_CONTEXT_CGROUP_NS:
+		context_type_string = config_event_context_cgroup_ns;
+		break;
+	case LTTNG_UST_CONTEXT_IPC_NS:
+		context_type_string = config_event_context_ipc_ns;
+		break;
+	case LTTNG_UST_CONTEXT_MNT_NS:
+		context_type_string = config_event_context_mnt_ns;
+		break;
+	case LTTNG_UST_CONTEXT_NET_NS:
+		context_type_string = config_event_context_net_ns;
+		break;
+	case LTTNG_UST_CONTEXT_PID_NS:
+		context_type_string = config_event_context_pid_ns;
+		break;
+	case LTTNG_UST_CONTEXT_USER_NS:
+		context_type_string = config_event_context_user_ns;
+		break;
+	case LTTNG_UST_CONTEXT_UTS_NS:
+		context_type_string = config_event_context_uts_ns;
+		break;
 	case LTTNG_UST_CONTEXT_PERF_THREAD_COUNTER:
 		/*
 		 * Error, should not be stored in the XML, perf contexts
@@ -2284,13 +2326,13 @@ static
 int save_session(struct ltt_session *session,
 	struct lttng_save_session_attr *attr, lttng_sock_cred *creds)
 {
-	int ret, fd;
-	unsigned int file_opened = 0;	/* Indicate if the file has been opened */
-	char config_file_path[PATH_MAX];
+	int ret, fd = -1;
+	char config_file_path[LTTNG_PATH_MAX];
 	size_t len;
 	struct config_writer *writer = NULL;
 	size_t session_name_len;
 	const char *provided_path;
+	int file_open_flags = O_CREAT | O_WRONLY | O_TRUNC;
 
 	assert(session);
 	assert(attr);
@@ -2314,7 +2356,7 @@ int save_session(struct ltt_session *session,
 			ret = LTTNG_ERR_SET_URL;
 			goto end;
 		}
-		strncpy(config_file_path, provided_path, len);
+		strncpy(config_file_path, provided_path, sizeof(config_file_path));
 	} else {
 		ssize_t ret_len;
 		char *home_dir = utils_get_user_home_dir(
@@ -2358,27 +2400,34 @@ int save_session(struct ltt_session *session,
 	 * was done just above.
 	 */
 	config_file_path[len++] = '/';
-	strncpy(config_file_path + len, session->name, session_name_len);
+	strncpy(config_file_path + len, session->name, sizeof(config_file_path) - len);
 	len += session_name_len;
 	strcpy(config_file_path + len, DEFAULT_SESSION_CONFIG_FILE_EXTENSION);
 	len += sizeof(DEFAULT_SESSION_CONFIG_FILE_EXTENSION);
 	config_file_path[len] = '\0';
 
-	if (!access(config_file_path, F_OK) && !attr->overwrite) {
-		/* File exists, notify the user since the overwrite flag is off. */
-		ret = LTTNG_ERR_SAVE_FILE_EXIST;
-		goto end;
+	if (!attr->overwrite) {
+		file_open_flags |= O_EXCL;
 	}
 
-	fd = run_as_open(config_file_path, O_CREAT | O_WRONLY | O_TRUNC,
+	fd = run_as_open(config_file_path, file_open_flags,
 		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
 		LTTNG_SOCK_GET_UID_CRED(creds), LTTNG_SOCK_GET_GID_CRED(creds));
 	if (fd < 0) {
 		PERROR("Could not create configuration file");
-		ret = LTTNG_ERR_SAVE_IO_FAIL;
+		switch (errno) {
+		case EEXIST:
+			ret = LTTNG_ERR_SAVE_FILE_EXIST;
+			break;
+		case EACCES:
+			ret = LTTNG_ERR_EPERM;
+			break;
+		default:
+			ret = LTTNG_ERR_SAVE_IO_FAIL;
+			break;
+		}
 		goto end;
 	}
-	file_opened = 1;
 
 	writer = config_writer_create(fd, 1);
 	if (!writer) {
@@ -2492,12 +2541,12 @@ end:
 	}
 	if (ret) {
 		/* Delete file in case of error */
-		if (file_opened && unlink(config_file_path)) {
+		if ((fd >= 0) && unlink(config_file_path)) {
 			PERROR("Unlinking XML session configuration.");
 		}
 	}
 
-	if (file_opened) {
+	if (fd >= 0) {
 		ret = close(fd);
 		if (ret) {
 			PERROR("Closing XML session configuration");