X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Frotate.c;h=d131944043ec4bf2667999137acb997fc056037b;hp=446b332e41354599a18b2967f85a33456b9b0faf;hb=657d1bf105996bf8f6e13af697fb1112afa61b28;hpb=1320cab14db79aad4429e9f207ba8fa27b52f498

diff --git a/src/lib/lttng-ctl/rotate.c b/src/lib/lttng-ctl/rotate.c
index 446b332e4..d13194404 100644
--- a/src/lib/lttng-ctl/rotate.c
+++ b/src/lib/lttng-ctl/rotate.c
@@ -1,22 +1,11 @@
 /*
- * Copyright (C) 2017 - Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2017 Julien Desfossez <jdesfossez@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #define _LGPL_SOURCE
-#include <assert.h>
 #include <string.h>
 
 #include <lttng/lttng-error.h>
@@ -179,7 +168,7 @@ void lttng_rotation_handle_destroy(
 	if (!rotation_handle) {
 		return;
 	}
-	lttng_trace_archive_location_destroy(rotation_handle->archive_location);
+	lttng_trace_archive_location_put(rotation_handle->archive_location);
 	free(rotation_handle);
 }
 
@@ -229,8 +218,11 @@ int lttng_rotate_session(const char *session_name,
 
 	memset(&lsm, 0, sizeof(lsm));
 	lsm.cmd_type = LTTNG_ROTATE_SESSION;
-	lttng_ctl_copy_string(lsm.session.name, session_name,
-			sizeof(lsm.session.name));
+
+	ret = lttng_strncpy(lsm.session.name, session_name,
+			    sizeof(lsm.session.name));
+	/* Source length already validated. */
+	LTTNG_ASSERT(ret == 0);
 
 	ret = lttng_ctl_ask_sessiond(&lsm, (void **) &rotate_return);
 	if (ret <= 0) {
@@ -292,36 +284,42 @@ enum lttng_rotation_status lttng_rotation_update_schedule(
 
 	memset(&lsm, 0, sizeof(lsm));
 	lsm.cmd_type = LTTNG_ROTATION_SET_SCHEDULE;
-	lttng_ctl_copy_string(lsm.session.name, session_name,
+	ret = lttng_strncpy(lsm.session.name, session_name,
 			sizeof(lsm.session.name));
+	/* Source length already validated. */
+	LTTNG_ASSERT(ret == 0);
 
 	lsm.u.rotation_set_schedule.type = (uint32_t) schedule->type;
 	switch (schedule->type) {
 	case LTTNG_ROTATION_SCHEDULE_TYPE_SIZE_THRESHOLD:
 	{
+		uint64_t threshold;
+
 		status = lttng_rotation_schedule_size_threshold_get_threshold(
-				schedule, &lsm.u.rotation_set_schedule.value);
+				schedule, &threshold);
 		if (status != LTTNG_ROTATION_STATUS_OK) {
 			if (status == LTTNG_ROTATION_STATUS_UNAVAILABLE) {
 				status = LTTNG_ROTATION_STATUS_INVALID;
 			}
 			goto end;
 		}
-
+		lsm.u.rotation_set_schedule.value = threshold;
 		lsm.u.rotation_set_schedule.set = !!add;
 		break;
 	}
 	case LTTNG_ROTATION_SCHEDULE_TYPE_PERIODIC:
 	{
+		uint64_t period;
+
 		status = lttng_rotation_schedule_periodic_get_period(
-				schedule, &lsm.u.rotation_set_schedule.value);
+				schedule, &period);
 		if (status != LTTNG_ROTATION_STATUS_OK) {
 			if (status == LTTNG_ROTATION_STATUS_UNAVAILABLE) {
 				status = LTTNG_ROTATION_STATUS_INVALID;
 			}
 			goto end;
 		}
-
+		lsm.u.rotation_set_schedule.value = period;
 		lsm.u.rotation_set_schedule.set = !!add;
 		break;
 	}
@@ -368,14 +366,23 @@ int get_schedules(const char *session_name,
 {
 	int ret;
 	struct lttcomm_session_msg lsm;
-	struct lttng_session_list_schedules_return *schedules_comm;
+	struct lttng_session_list_schedules_return *schedules_comm = NULL;
 	struct lttng_rotation_schedules *schedules = NULL;
 	struct lttng_rotation_schedule *periodic = NULL, *size = NULL;
 
+	if (!session_name) {
+		ret = -LTTNG_ERR_INVALID;
+		goto end;
+	}
+
 	memset(&lsm, 0, sizeof(lsm));
 	lsm.cmd_type = LTTNG_SESSION_LIST_ROTATION_SCHEDULES;
-	lttng_ctl_copy_string(lsm.session.name, session_name,
+	ret = lttng_strncpy(lsm.session.name, session_name,
 			sizeof(lsm.session.name));
+	if (ret) {
+		ret = -LTTNG_ERR_INVALID;
+		goto end;
+	}
 
 	ret = lttng_ctl_ask_sessiond(&lsm, (void **) &schedules_comm);
 	if (ret < 0) {