Looking into a number of coverity reports (false positives), I
identified a number of sites which use the maximal symbol length
constant when the actual size of an array can be used. This will prevent
mismatches in the future should the array sizes change.
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ia74f43d3871fdce60affbde068401b58c84b09ad
if (symbol_name) {
strncpy_ret = lttng_strncpy(
kernel_event_notifier->event.u.kprobe.symbol_name,
if (symbol_name) {
strncpy_ret = lttng_strncpy(
kernel_event_notifier->event.u.kprobe.symbol_name,
- symbol_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN);
+ symbol_name,
+ sizeof(kernel_event_notifier->event.u.kprobe.symbol_name));
if (strncpy_ret) {
ret_code = LTTNG_ERR_INVALID;
if (strncpy_ret) {
ret_code = LTTNG_ERR_INVALID;
lttng_buffer_view_from_view(view, offset,
channel_comm->name_len);
lttng_buffer_view_from_view(view, offset,
channel_comm->name_len);
- if (channel_comm->name_len > LTTNG_SYMBOL_NAME_LEN - 1) {
- ret = -1;
- goto end;
- }
-
name = name_view.data;
if (!lttng_buffer_view_contains_string(
&name_view, name, channel_comm->name_len)) {
name = name_view.data;
if (!lttng_buffer_view_contains_string(
&name_view, name, channel_comm->name_len)) {
- strcpy(local_channel->name, name);
+ ret = lttng_strncpy(local_channel->name, name,
+ sizeof(local_channel->name));
+ if (ret) {
+ goto end;
+ }
+
offset += channel_comm->name_len;
}
offset += channel_comm->name_len;
}
LTTNG_ASSERT(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK);
copy_ret = lttng_strncpy(exclusions->names[i], exclusion_str,
LTTNG_ASSERT(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK);
copy_ret = lttng_strncpy(exclusions->names[i], exclusion_str,
- LTTNG_SYMBOL_NAME_LEN);
+ sizeof(exclusions->names[i]));
if (copy_ret) {
free(exclusions);
exclusions = NULL;
if (copy_ret) {
free(exclusions);
exclusions = NULL;
size_t symbol_name_len;
struct lttng_event_probe_attr_comm comm = {};
size_t symbol_name_len;
struct lttng_event_probe_attr_comm comm = {};
- symbol_name_len = lttng_strnlen(probe->symbol_name, LTTNG_SYMBOL_NAME_LEN);
- if (symbol_name_len == LTTNG_SYMBOL_NAME_LEN) {
+ symbol_name_len = lttng_strnlen(
+ probe->symbol_name, sizeof(probe->symbol_name));
+ if (symbol_name_len == sizeof(probe->symbol_name)) {
/* Not null-termintated. */
ret = -1;
goto end;
/* Not null-termintated. */
ret = -1;
goto end;
size_t symbol_name_len;
struct lttng_event_function_attr_comm comm = { 0 };
size_t symbol_name_len;
struct lttng_event_function_attr_comm comm = { 0 };
- symbol_name_len = lttng_strnlen(function->symbol_name, LTTNG_SYMBOL_NAME_LEN);
- if (symbol_name_len == LTTNG_SYMBOL_NAME_LEN) {
+ symbol_name_len = lttng_strnlen(
+ function->symbol_name, sizeof(function->symbol_name));
+ if (symbol_name_len == sizeof(function->symbol_name)) {
/* Not null-termintated. */
ret = -1;
goto end;
/* Not null-termintated. */
ret = -1;
goto end;
}
ret = lttng_strncpy(local_attr->symbol_name, name,
}
ret = lttng_strncpy(local_attr->symbol_name, name,
- LTTNG_SYMBOL_NAME_LEN);
+ sizeof(local_attr->symbol_name));
if (ret) {
ret = -1;
goto end;
if (ret) {
ret = -1;
goto end;
}
ret = lttng_strncpy(local_attr->symbol_name, name,
}
ret = lttng_strncpy(local_attr->symbol_name, name,
- LTTNG_SYMBOL_NAME_LEN);
+ sizeof(local_attr->symbol_name));
if (ret) {
ret = -1;
goto end;
if (ret) {
ret = -1;
goto end;
- ret = lttng_strncpy(local_exclusions->names[i],
- string, LTTNG_SYMBOL_NAME_LEN);
+ ret = lttng_strncpy(local_exclusions->names[i], string,
+ sizeof(local_exclusions->names[i]));
if (ret) {
ret = -1;
goto end;
if (ret) {
ret = -1;
goto end;
- ret = lttng_strncpy(
- local_event->name, name, LTTNG_SYMBOL_NAME_LEN);
+ ret = lttng_strncpy(local_event->name, name,
+ sizeof(local_event->name));
if (ret) {
ret = -1;
goto end;
if (ret) {
ret = -1;
goto end;
/* Save the header location for later in-place header update. */
header_offset = payload->buffer.size;
/* Save the header location for later in-place header update. */
header_offset = payload->buffer.size;
- name_len = lttng_strnlen(event->name, LTTNG_SYMBOL_NAME_LEN);
- if (name_len == LTTNG_SYMBOL_NAME_LEN) {
+ name_len = lttng_strnlen(event->name, sizeof(event->name));
+ if (name_len == sizeof(event->name)) {
/* Event name is not NULL-terminated. */
ret = -1;
goto end;
/* Event name is not NULL-terminated. */
ret = -1;
goto end;
comm.config = context->config;
comm.type = context->type;
comm.config = context->config;
comm.type = context->type;
- comm.name_len = lttng_strnlen(context->name, LTTNG_SYMBOL_NAME_LEN);
+ comm.name_len = lttng_strnlen(context->name, sizeof(context->name));
- if (comm.name_len == LTTNG_SYMBOL_NAME_LEN) {
+ if (comm.name_len == sizeof(context->name)) {
assert(name);
assert(event);
assert(name);
assert(event);
- if (lttng_strncpy(local_event_field->field_name, name , LTTNG_SYMBOL_NAME_LEN)) {
+ if (lttng_strncpy(local_event_field->field_name, name,
+ sizeof(local_event_field->field_name))) {
/* Save the header location for later in-place header update. */
header_offset = payload->buffer.size;
/* Save the header location for later in-place header update. */
header_offset = payload->buffer.size;
- name_len = strnlen(field->field_name, LTTNG_SYMBOL_NAME_LEN);
- if (name_len == LTTNG_SYMBOL_NAME_LEN) {
+ name_len = strnlen(field->field_name, sizeof(field->field_name));
+ if (name_len == sizeof(field->field_name)) {
/* Event name is not NULL-terminated. */
ret = -1;
goto end;
/* Event name is not NULL-terminated. */
ret = -1;
goto end;