X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsave.c;h=3c4c3b2bce527045f7c1c9d3c09f00773fd68a07;hb=7f5ed73a87449fc7133a2bf7268a7f59f191e155;hp=c03b17ea8e312a85db5c5b2d44c7ebc458a600a4;hpb=c1e83fb4cecbb43353e4e1d2092b0516b50a5c26;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index c03b17ea8..3c4c3b2bc 100644
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -215,16 +215,16 @@ const char *get_kernel_instrumentation_string(
 		instrumentation_string = config_event_type_tracepoint;
 		break;
 	case LTTNG_KERNEL_KPROBE:
-		instrumentation_string = config_event_type_kprobe;
+		instrumentation_string = config_event_type_probe;
 		break;
 	case LTTNG_KERNEL_UPROBE:
 		instrumentation_string = config_event_type_userspace_probe;
 		break;
 	case LTTNG_KERNEL_FUNCTION:
-		instrumentation_string = config_event_type_function;
+		instrumentation_string = config_event_type_function_entry;
 		break;
 	case LTTNG_KERNEL_KRETPROBE:
-		instrumentation_string = config_event_type_kretprobe;
+		instrumentation_string = config_event_type_function;
 		break;
 	case LTTNG_KERNEL_NOOP:
 		instrumentation_string = config_event_type_noop;
@@ -504,8 +504,8 @@ int save_kernel_userspace_probe_tracepoint_event(struct config_writer *writer,
 {
 	int ret = 0;
 	const char *probe_name, *provider_name, *binary_path;
-	struct lttng_userspace_probe_location *userspace_probe_location;
-	struct lttng_userspace_probe_location_lookup_method *lookup_method;
+	const struct lttng_userspace_probe_location *userspace_probe_location;
+	const struct lttng_userspace_probe_location_lookup_method *lookup_method;
 	enum lttng_userspace_probe_location_lookup_method_type lookup_type;
 
 	/* Get userspace probe location from the event. */
@@ -618,8 +618,8 @@ int save_kernel_userspace_probe_function_event(struct config_writer *writer,
 {
 	int ret = 0;
 	const char *function_name, *binary_path;
-	struct lttng_userspace_probe_location *userspace_probe_location;
-	struct lttng_userspace_probe_location_lookup_method *lookup_method;
+	const struct lttng_userspace_probe_location *userspace_probe_location;
+	const struct lttng_userspace_probe_location_lookup_method *lookup_method;
 	enum lttng_userspace_probe_location_lookup_method_type lookup_type;
 
 	/* Get userspace probe location from the event. */
@@ -2245,6 +2245,9 @@ int save_session_rotation_schedules(struct config_writer *writer,
 
 	ret = config_writer_open_element(writer,
 			config_element_rotation_schedules);
+	if (ret) {
+		goto end;
+	}
 	if (session->rotate_timer_period) {
 		ret = save_session_rotation_schedule(writer,
 				LTTNG_ROTATION_SCHEDULE_TYPE_PERIODIC,
@@ -2281,9 +2284,8 @@ 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;
@@ -2298,7 +2300,7 @@ int save_session(struct ltt_session *session,
 
 	if (!session_access_ok(session,
 		LTTNG_SOCK_GET_UID_CRED(creds),
-		LTTNG_SOCK_GET_GID_CRED(creds))) {
+		LTTNG_SOCK_GET_GID_CRED(creds)) || session->destroyed) {
 		ret = LTTNG_ERR_EPERM;
 		goto end;
 	}
@@ -2311,7 +2313,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(
@@ -2355,7 +2357,7 @@ 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);
@@ -2375,7 +2377,6 @@ int save_session(struct ltt_session *session,
 		ret = LTTNG_ERR_SAVE_IO_FAIL;
 		goto end;
 	}
-	file_opened = 1;
 
 	writer = config_writer_create(fd, 1);
 	if (!writer) {
@@ -2489,12 +2490,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");
@@ -2524,6 +2525,7 @@ int cmd_save_sessions(struct lttng_save_session_attr *attr,
 		session_lock(session);
 		ret = save_session(session, attr, creds);
 		session_unlock(session);
+		session_put(session);
 		if (ret) {
 			goto end;
 		}
@@ -2531,10 +2533,13 @@ int cmd_save_sessions(struct lttng_save_session_attr *attr,
 		struct ltt_session_list *list = session_get_list();
 
 		cds_list_for_each_entry(session, &list->head, list) {
+			if (!session_get(session)) {
+				continue;
+			}
 			session_lock(session);
 			ret = save_session(session, attr, creds);
 			session_unlock(session);
-
+			session_put(session);
 			/* Don't abort if we don't have the required permissions. */
 			if (ret && ret != LTTNG_ERR_EPERM) {
 				goto end;