Fix: unchecked buffer size for communication header

[lttng-tools.git] / src / common / location.c

diff --git a/src/common/location.c b/src/common/location.c
index c71ec8a1b6859240c6d0b15351b39b6d99b674b4..c79f8547546f6e65e0aa2dd5012c9c187f1108b7 100644 (file)
--- a/src/common/location.c
+++ b/src/common/location.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2018 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2018 Jérémie Galarneau <jeremie.galarneau@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
  */
 
 #include <lttng/location-internal.h>
@@ -135,11 +125,12 @@ ssize_t lttng_trace_archive_location_create_from_buffer(
 
        location_comm_view = lttng_buffer_view_from_view(view, 0,
                        sizeof(*location_comm));
-       if (!location_comm_view.data) {
+       if (!lttng_buffer_view_is_valid(&location_comm_view)) {
                goto error;
        }
+
        offset += location_comm_view.size;
-       location_comm = (const struct lttng_trace_archive_location_comm *) view->data;
+       location_comm = (const struct lttng_trace_archive_location_comm *) location_comm_view.data;
 
        switch ((enum lttng_trace_archive_location_type) location_comm->type) {
        case LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL:
@@ -148,9 +139,10 @@ ssize_t lttng_trace_archive_location_create_from_buffer(
                                lttng_buffer_view_from_view(view, offset,
                                location_comm->types.local.absolute_path_len);
 
-               if (!absolute_path_view.data) {
+               if (!lttng_buffer_view_is_valid(&absolute_path_view)) {
                        goto error;
                }
+
                if (absolute_path_view.data[absolute_path_view.size - 1] != '\0') {
                        goto error;
                }
@@ -173,9 +165,12 @@ ssize_t lttng_trace_archive_location_create_from_buffer(
                                offset + hostname_view.size,
                                location_comm->types.relay.relative_path_len);
 
-               if (!hostname_view.data || !relative_path_view.data) {
+               if (!lttng_buffer_view_is_valid(&hostname_view) ||
+                               !lttng_buffer_view_is_valid(
+                                               &relative_path_view)) {
                        goto error;
                }
+
                if (hostname_view.data[hostname_view.size - 1] != '\0') {
                        goto error;
                }
@@ -211,7 +206,6 @@ ssize_t lttng_trace_archive_location_serialize(
 {
        int ret;
        struct lttng_trace_archive_location_comm location_comm;
-       const size_t original_buffer_size = buffer->size;
 
        location_comm.type = (int8_t) location->type;
 
@@ -269,7 +263,7 @@ ssize_t lttng_trace_archive_location_serialize(
                abort();
        }
 
-       return buffer->size - original_buffer_size;
+       return 0;
 error:
        return -1;
 }