X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fnotification.c;h=a4e971bd572c159b4a54d90643965dd1479b937d;hb=e957bf98e634c79b13281d0a2fe144be0245d310;hp=806c5561936a985142882636423c7e58c09c2269;hpb=c0a66c84b5b2484b75798aec7543b680b4d4ab6c;p=lttng-tools.git

diff --git a/src/common/notification.c b/src/common/notification.c
index 806c55619..a4e971bd5 100644
--- a/src/common/notification.c
+++ b/src/common/notification.c
@@ -10,8 +10,8 @@
 #include <lttng/condition/evaluation-internal.h>
 #include <lttng/condition/condition.h>
 #include <lttng/condition/evaluation.h>
-#include <common/sessiond-comm/payload.h>
-#include <common/sessiond-comm/payload-view.h>
+#include <common/payload.h>
+#include <common/payload-view.h>
 #include <assert.h>
 
 LTTNG_HIDDEN
@@ -78,16 +78,25 @@ ssize_t lttng_notification_create_from_payload(
 		struct lttng_notification **notification)
 {
 	ssize_t ret, notification_size = 0, condition_size, evaluation_size;
-	const struct lttng_notification_comm *notification_comm;
 	struct lttng_condition *condition;
 	struct lttng_evaluation *evaluation;
+	const struct lttng_notification_comm *notification_comm;
+	const struct lttng_payload_view notification_comm_view =
+			lttng_payload_view_from_view(
+					src_view, 0, sizeof(*notification_comm));
 
 	if (!src_view || !notification) {
 		ret = -1;
 		goto end;
 	}
 
-	notification_comm = (typeof(notification_comm)) src_view->buffer.data;
+	if (!lttng_payload_view_is_valid(&notification_comm_view)) {
+		/* Payload not large enough to contain the header. */
+		ret = -1;
+		goto end;
+	}
+
+	notification_comm = (typeof(notification_comm)) notification_comm_view.buffer.data;
 	notification_size += sizeof(*notification_comm);
 	{
 		/* struct lttng_condition */
@@ -113,7 +122,7 @@ ssize_t lttng_notification_create_from_payload(
 						notification_size, -1);
 
 		evaluation_size = lttng_evaluation_create_from_payload(
-				&evaluation_view, &evaluation);
+				condition, &evaluation_view, &evaluation);
 	}
 
 	if (evaluation_size < 0) {