From 2f8d430ce8e8429d5278d77ce4627a49c82403bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Fri, 11 Sep 2020 11:10:44 -0400 Subject: [PATCH] Revert "userspace-probe: replace explicit null-termination check" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit b9e63e21bd01c0deeaec2195ba912e38460bc038. Signed-off-by: Jérémie Galarneau Change-Id: I909339dbdcf4a7931ad95c5b4b6af152aa52487c --- src/common/userspace-probe.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/common/userspace-probe.c b/src/common/userspace-probe.c index 49cc83575..9e5429f73 100644 --- a/src/common/userspace-probe.c +++ b/src/common/userspace-probe.c @@ -1212,14 +1212,11 @@ int lttng_userspace_probe_location_function_create_from_payload( binary_path_src = function_name_src + location_function_comm->function_name_len; - if (lttng_buffer_view_contains_string(&view->buffer, function_name_src, - location_function_comm->function_name_len)) { + if (function_name_src[location_function_comm->function_name_len - 1] != '\0') { ret = -LTTNG_ERR_INVALID; goto end; } - - if (lttng_buffer_view_contains_string(&view->buffer, binary_path_src, - location_function_comm->binary_path_len)) { + if (binary_path_src[location_function_comm->binary_path_len - 1] != '\0') { ret = -LTTNG_ERR_INVALID; goto end; } @@ -1303,20 +1300,17 @@ int lttng_userspace_probe_location_tracepoint_create_from_payload( binary_path_src = provider_name_src + location_tracepoint_comm->provider_name_len; - if (lttng_buffer_view_contains_string(&view->buffer, probe_name_src, - location_tracepoint_comm->probe_name_len)) { + if (probe_name_src[location_tracepoint_comm->probe_name_len - 1] != '\0') { ret = -LTTNG_ERR_INVALID; goto end; } - if (lttng_buffer_view_contains_string(&view->buffer, provider_name_src, - location_tracepoint_comm->provider_name_len)) { + if (provider_name_src[location_tracepoint_comm->provider_name_len - 1] != '\0') { ret = -LTTNG_ERR_INVALID; goto end; } - if (lttng_buffer_view_contains_string(&view->buffer, binary_path_src, - location_tracepoint_comm->binary_path_len)) { + if (binary_path_src[location_tracepoint_comm->binary_path_len - 1] != '\0') { ret = -LTTNG_ERR_INVALID; goto end; } -- 2.34.1