X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fevent.cpp;h=f33518eee4eece45c2c8ce762cb22765a682209b;hb=fa9870ceddc6f5ddd4bbf8cda2a87365b78fdf0e;hp=6d82504e2fe71611be5c86a1aea8b03cbb301c4a;hpb=f4f239b35cbae2a8501b1a082e0fd62d8cd117a6;p=lttng-tools.git diff --git a/src/common/event.cpp b/src/common/event.cpp index 6d82504e2..f33518eee 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -5,28 +5,28 @@ * */ -#include "common/compat/string.h" -#include "common/macros.h" -#include "lttng/lttng-error.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include + #include -#include +#include #include -#include -#include -#include +#include +#include +namespace { struct event_list_element { struct lttng_event *event; struct lttng_event_exclusion *exclusions; char *filter_expression; }; +} /* namespace */ static void event_list_destructor(void *ptr) { @@ -43,7 +43,7 @@ struct lttng_event *lttng_event_copy(const struct lttng_event *event) struct lttng_event *new_event; struct lttng_event_extended *new_event_extended; - new_event = (lttng_event *) zmalloc(sizeof(*event)); + new_event = zmalloc(); if (!new_event) { PERROR("Error allocating event structure"); goto end; @@ -56,7 +56,7 @@ struct lttng_event *lttng_event_copy(const struct lttng_event *event) * We need to create a new extended since the previous pointer is now * invalid. */ - new_event_extended = (lttng_event_extended *) zmalloc(sizeof(*new_event_extended)); + new_event_extended = zmalloc(); if (!new_event_extended) { PERROR("Error allocating event extended structure"); goto error; @@ -77,10 +77,11 @@ static int lttng_event_probe_attr_serialize( { int ret; size_t symbol_name_len; - struct lttng_event_probe_attr_comm comm = { 0 }; + 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; @@ -112,10 +113,13 @@ static int lttng_event_function_attr_serialize( { int ret; size_t symbol_name_len; - struct lttng_event_function_attr_comm comm = { 0 }; + struct lttng_event_function_attr_comm comm; + + comm.symbol_name_len = 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; @@ -157,8 +161,7 @@ static ssize_t lttng_event_probe_attr_create_from_payload( comm = (typeof(comm)) comm_view.buffer.data; offset += sizeof(*comm); - local_attr = (struct lttng_event_probe_attr *) zmalloc( - sizeof(*local_attr)); + local_attr = zmalloc(); if (local_attr == NULL) { ret = -1; goto end; @@ -187,7 +190,7 @@ static ssize_t lttng_event_probe_attr_create_from_payload( } ret = lttng_strncpy(local_attr->symbol_name, name, - LTTNG_SYMBOL_NAME_LEN); + sizeof(local_attr->symbol_name)); if (ret) { ret = -1; goto end; @@ -200,6 +203,7 @@ static ssize_t lttng_event_probe_attr_create_from_payload( local_attr = NULL; ret = offset; end: + free(local_attr); return ret; } @@ -221,8 +225,7 @@ static ssize_t lttng_event_function_attr_create_from_payload( comm = (typeof(comm)) view->buffer.data; offset += sizeof(*comm); - local_attr = (struct lttng_event_function_attr *) zmalloc( - sizeof(*local_attr)); + local_attr = zmalloc(); if (local_attr == NULL) { ret = -1; goto end; @@ -248,7 +251,7 @@ static ssize_t lttng_event_function_attr_create_from_payload( } ret = lttng_strncpy(local_attr->symbol_name, name, - LTTNG_SYMBOL_NAME_LEN); + sizeof(local_attr->symbol_name)); if (ret) { ret = -1; goto end; @@ -261,6 +264,7 @@ static ssize_t lttng_event_function_attr_create_from_payload( local_attr = NULL; ret = offset; end: + free(local_attr); return ret; } @@ -270,12 +274,12 @@ static ssize_t lttng_event_exclusions_create_from_payload( struct lttng_event_exclusion **exclusions) { ssize_t ret, offset = 0; - size_t size = (count * LTTNG_SYMBOL_NAME_LEN); + const size_t size = (count * LTTNG_SYMBOL_NAME_LEN); uint32_t i; const struct lttng_event_exclusion_comm *comm; struct lttng_event_exclusion *local_exclusions; - local_exclusions = (struct lttng_event_exclusion *) zmalloc( + local_exclusions = zmalloc( sizeof(struct lttng_event_exclusion) + size); if (!local_exclusions) { ret = -1; @@ -315,8 +319,8 @@ static ssize_t lttng_event_exclusions_create_from_payload( goto end; } - ret = lttng_strncpy(local_exclusions->names[i], - string, LTTNG_SYMBOL_NAME_LEN); + ret = lttng_strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(local_exclusions, i), string, + sizeof(LTTNG_EVENT_EXCLUSION_NAME_AT(local_exclusions, i))); if (ret) { ret = -1; goto end; @@ -404,8 +408,8 @@ ssize_t lttng_event_create_from_payload(struct lttng_payload_view *view, 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; @@ -508,8 +512,7 @@ deserialize_filter_expression: goto end; } - local_bytecode = (struct lttng_bytecode *) zmalloc( - event_comm->bytecode_len); + local_bytecode = zmalloc(event_comm->bytecode_len); if (!local_bytecode) { ret = -1; goto end; @@ -619,7 +622,7 @@ deserialize_event_type_payload: } if (ret != event_comm->userspace_probe_location_len) { - WARN("Userspace probe location from the received buffer is not the advertised length: header length = %" PRIu32 ", payload length = %lu", event_comm->userspace_probe_location_len, ret); + WARN("Userspace probe location from the received buffer is not the advertised length: header length = %" PRIu32 ", payload length = %zd", event_comm->userspace_probe_location_len, ret); ret = -1; goto end; } @@ -698,7 +701,7 @@ int lttng_event_serialize(const struct lttng_event *event, unsigned int i; size_t header_offset, size_before_payload; size_t name_len; - struct lttng_event_comm event_comm = { 0 }; + struct lttng_event_comm event_comm = {}; struct lttng_event_comm *header; assert(event); @@ -708,8 +711,8 @@ int lttng_event_serialize(const struct lttng_event *event, /* 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; @@ -763,9 +766,9 @@ int lttng_event_serialize(const struct lttng_event *event, for (i = 0; i < exclusion_count; i++) { const size_t exclusion_len = lttng_strnlen( *(exclusion_list + i), LTTNG_SYMBOL_NAME_LEN); - const struct lttng_event_exclusion_comm exclusion_header = { - .len = (uint32_t) exclusion_len + 1, - }; + struct lttng_event_exclusion_comm exclusion_header; + + exclusion_header.len = (uint32_t) exclusion_len + 1; if (exclusion_len == LTTNG_SYMBOL_NAME_LEN) { /* Exclusion is not NULL-terminated. */ @@ -995,7 +998,8 @@ static ssize_t lttng_event_context_perf_counter_populate_from_payload( const struct lttng_payload_view *view, struct lttng_event_context *event_ctx) { - ssize_t ret, offset = 0; + int ret; + ssize_t consumed, offset = 0; const struct lttng_event_context_perf_counter_comm *comm; size_t name_len; const struct lttng_buffer_view comm_view = lttng_buffer_view_from_view( @@ -1007,7 +1011,7 @@ static ssize_t lttng_event_context_perf_counter_populate_from_payload( event_ctx->ctx == LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER); if (!lttng_buffer_view_is_valid(&comm_view)) { - ret = -1; + consumed = -1; goto end; } @@ -1024,7 +1028,7 @@ static ssize_t lttng_event_context_perf_counter_populate_from_payload( name_len); if (!lttng_buffer_view_is_valid(&provider_name_view)) { - ret = -1; + consumed = -1; goto end; } @@ -1032,21 +1036,26 @@ static ssize_t lttng_event_context_perf_counter_populate_from_payload( if (!lttng_buffer_view_contains_string( &provider_name_view, name, name_len)) { - ret = -1; + consumed = -1; goto end; } - lttng_strncpy(event_ctx->u.perf_counter.name, name, name_len); + ret = lttng_strncpy(event_ctx->u.perf_counter.name, name, + sizeof(event_ctx->u.perf_counter.name)); + if (ret) { + consumed = -1; + goto end; + } offset += name_len; } event_ctx->u.perf_counter.config = comm->config; event_ctx->u.perf_counter.type = comm->type; - ret = offset; + consumed = offset; end: - return ret; + return consumed; } ssize_t lttng_event_context_create_from_payload( @@ -1070,8 +1079,7 @@ ssize_t lttng_event_context_create_from_payload( comm = (typeof(comm)) comm_view.data; offset += sizeof(*comm); - local_context = (struct lttng_event_context *) - zmalloc(sizeof(*local_context)); + local_context = zmalloc(); if (!local_context) { ret = -1; goto end; @@ -1121,7 +1129,7 @@ static int lttng_event_context_app_serialize( struct lttng_payload *payload) { int ret; - struct lttng_event_context_app_comm comm = { 0 }; + struct lttng_event_context_app_comm comm = {}; size_t provider_len, ctx_len; const char *provider_name; const char *ctx_name; @@ -1189,16 +1197,16 @@ static int lttng_event_context_perf_counter_serialize( struct lttng_payload *payload) { int ret; - struct lttng_event_context_perf_counter_comm comm = { 0 }; + struct lttng_event_context_perf_counter_comm comm = {}; assert(payload); assert(context); 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)) { ret = -1; goto end; } @@ -1229,7 +1237,9 @@ int lttng_event_context_serialize(struct lttng_event_context *context, struct lttng_payload *payload) { int ret; - struct lttng_event_context_comm context_comm = { 0 }; + struct lttng_event_context_comm context_comm; + + context_comm.type = 0; assert(context); assert(payload); @@ -1323,8 +1333,7 @@ ssize_t lttng_event_field_create_from_payload( offset += sizeof(*comm); } - local_event_field = (struct lttng_event_field *) - zmalloc(sizeof(*local_event_field)); + local_event_field = zmalloc(); if (!local_event_field) { ret = -1; goto end; @@ -1387,7 +1396,8 @@ ssize_t lttng_event_field_create_from_payload( 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))) { ret = -1; goto end; } @@ -1410,7 +1420,7 @@ int lttng_event_field_serialize(const struct lttng_event_field *field, int ret; size_t header_offset, size_before_event; size_t name_len; - struct lttng_event_field_comm event_field_comm = { 0 }; + struct lttng_event_field_comm event_field_comm = {}; struct lttng_event_field_comm *header; assert(field); @@ -1419,8 +1429,8 @@ int lttng_event_field_serialize(const struct lttng_event_field *field, /* 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; @@ -1481,6 +1491,9 @@ static enum lttng_error_code compute_flattened_size( /* The basic struct lttng_event */ storage_req = event_count * sizeof(struct lttng_event); + /* The struct·lttng_event_extended */ + storage_req += event_count * sizeof(struct lttng_event_extended); + for (i = 0; i < event_count; i++) { int probe_storage_req = 0; const struct event_list_element *element = (const struct event_list_element *) @@ -1501,10 +1514,6 @@ static enum lttng_error_code compute_flattened_size( probe_storage_req = ret; } - /* The struct·lttng_event_extended */ - storage_req += event_count * - sizeof(struct lttng_event_extended); - if (element->filter_expression) { storage_req += strlen(element->filter_expression) + 1; } @@ -1705,8 +1714,7 @@ static enum lttng_error_code event_list_create_from_payload( ssize_t event_size; struct lttng_payload_view event_view = lttng_payload_view_from_view(view, offset, -1); - struct event_list_element *element = - (struct event_list_element *) zmalloc(sizeof(*element)); + struct event_list_element *element = zmalloc(); if (!element) { ret_code = LTTNG_ERR_NOMEM; @@ -1862,7 +1870,7 @@ static enum lttng_error_code event_field_list_create_from_payload( assert(view); assert(event_field_list); - list = (struct lttng_dynamic_pointer_array *) zmalloc(sizeof(*list)); + list = zmalloc(); if (!list) { ret_code = LTTNG_ERR_NOMEM; goto end;