projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: liblttng-ctl: unreported truncations when copying strings
[lttng-tools.git]
/
src
/
lib
/
lttng-ctl
/
rotate.c
diff --git
a/src/lib/lttng-ctl/rotate.c
b/src/lib/lttng-ctl/rotate.c
index 446b332e41354599a18b2967f85a33456b9b0faf..bd048aa2e07ec1a568a6fb100b324e5e469e9fc6 100644
(file)
--- a/
src/lib/lttng-ctl/rotate.c
+++ b/
src/lib/lttng-ctl/rotate.c
@@
-229,8
+229,11
@@
int lttng_rotate_session(const char *session_name,
memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_ROTATE_SESSION;
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. */
+ assert(ret == 0);
ret = lttng_ctl_ask_sessiond(&lsm, (void **) &rotate_return);
if (ret <= 0) {
ret = lttng_ctl_ask_sessiond(&lsm, (void **) &rotate_return);
if (ret <= 0) {
@@
-292,36
+295,42
@@
enum lttng_rotation_status lttng_rotation_update_schedule(
memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_ROTATION_SET_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));
sizeof(lsm.session.name));
+ /* Source length already validated. */
+ assert(ret == 0);
lsm.u.rotation_set_schedule.type = (uint32_t) schedule->type;
switch (schedule->type) {
case LTTNG_ROTATION_SCHEDULE_TYPE_SIZE_THRESHOLD:
{
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(
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;
}
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:
{
lsm.u.rotation_set_schedule.set = !!add;
break;
}
case LTTNG_ROTATION_SCHEDULE_TYPE_PERIODIC:
{
+ uint64_t period;
+
status = lttng_rotation_schedule_periodic_get_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;
}
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;
}
lsm.u.rotation_set_schedule.set = !!add;
break;
}
@@
-368,14
+377,23
@@
int get_schedules(const char *session_name,
{
int ret;
struct lttcomm_session_msg lsm;
{
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;
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;
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));
sizeof(lsm.session.name));
+ if (ret) {
+ ret = -LTTNG_ERR_INVALID;
+ goto end;
+ }
ret = lttng_ctl_ask_sessiond(&lsm, (void **) &schedules_comm);
if (ret < 0) {
ret = lttng_ctl_ask_sessiond(&lsm, (void **) &schedules_comm);
if (ret < 0) {
This page took
0.025876 seconds
and
4
git commands to generate.