X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fuprobe.c;h=d9c1fc20c5a268070c00bc6c28806d8f93946aae;hp=8d63975ab0ba644673ce222bfde67d992440f643;hb=3e6e0df2f8f9f23d252c2508b6d741916dfcc4b3;hpb=df08d338ff7f7ced42ba49530617b06a73678669

diff --git a/src/common/event-rule/uprobe.c b/src/common/event-rule/uprobe.c
index 8d63975ab..d9c1fc20c 100644
--- a/src/common/event-rule/uprobe.c
+++ b/src/common/event-rule/uprobe.c
@@ -211,24 +211,19 @@ ssize_t lttng_event_rule_uprobe_create_from_payload(
 		goto end;
 	}
 
-	if (view->buffer.size < sizeof(*uprobe_comm)) {
-		ERR("Failed to initialize from malformed event rule uprobe: buffer too short to contain header.");
-		ret = -1;
-		goto end;
-	}
-
 	current_buffer_view = lttng_buffer_view_from_view(
 			&view->buffer, offset, sizeof(*uprobe_comm));
-	uprobe_comm = (typeof(uprobe_comm)) current_buffer_view.data;
-
-	if (!uprobe_comm) {
+	if (!lttng_buffer_view_is_valid(&current_buffer_view)) {
+		ERR("Failed to initialize from malformed event rule uprobe: buffer too short to contain header");
 		ret = -1;
 		goto end;
 	}
 
+	uprobe_comm = (typeof(uprobe_comm)) current_buffer_view.data;
+
 	rule = lttng_event_rule_uprobe_create();
 	if (!rule) {
-		ERR("Failed to create event rule uprobe.");
+		ERR("Failed to create event rule uprobe");
 		ret = -1;
 		goto end;
 	}
@@ -239,12 +234,12 @@ ssize_t lttng_event_rule_uprobe_create_from_payload(
 	/* Map the name. */
 	current_buffer_view = lttng_buffer_view_from_view(
 			&view->buffer, offset, uprobe_comm->name_len);
-	name = current_buffer_view.data;
-	if (!name) {
+	if (!lttng_buffer_view_is_valid(&current_buffer_view)) {
 		ret = -1;
 		goto end;
 	}
 
+	name = current_buffer_view.data;
 	if (!lttng_buffer_view_contains_string(&current_buffer_view, name,
 			uprobe_comm->name_len)) {
 		ret = -1;
@@ -255,14 +250,23 @@ ssize_t lttng_event_rule_uprobe_create_from_payload(
 	offset += uprobe_comm->name_len;
 
 	/* Map the location. */
-	struct lttng_payload_view current_payload_view =
-			lttng_payload_view_from_view(view, offset,
-					uprobe_comm->location_len);
-	ret = lttng_userspace_probe_location_create_from_payload(
-			&current_payload_view, &location);
-	if (ret < 0) {
-		ret = -1;
-		goto end;
+	{
+		struct lttng_payload_view current_payload_view =
+				lttng_payload_view_from_view(view, offset,
+						uprobe_comm->location_len);
+
+		if (!lttng_payload_view_is_valid(&current_payload_view)) {
+			ERR("Failed to initialize from malformed event rule uprobe: buffer too short to contain location");
+			ret = -1;
+			goto end;
+		}
+
+		ret = lttng_userspace_probe_location_create_from_payload(
+				&current_payload_view, &location);
+		if (ret < 0) {
+			ret = -1;
+			goto end;
+		}
 	}
 
 	assert(ret == uprobe_comm->location_len);