X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fevent-rule.c;h=627674ba90026a84cb912aa407b2a4909465f8e0;hp=cdf3e0dedbea19b357fcb68a8342a26cf27c44ef;hb=58daac01d91347336f24e1fc1cacd4e7a3101e93;hpb=6d420eff669a3de55be3ee348f88a4e244b78ecf diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c index cdf3e0ded..627674ba9 100644 --- a/src/common/event-rule/event-rule.c +++ b/src/common/event-rule/event-rule.c @@ -145,16 +145,24 @@ ssize_t lttng_event_rule_create_from_payload( struct lttng_event_rule **event_rule) { ssize_t ret, consumed = 0; - const struct lttng_event_rule_comm *event_rule_comm; event_rule_create_from_payload_cb create_from_payload = NULL; + const struct lttng_event_rule_comm *event_rule_comm; + const struct lttng_payload_view event_rule_comm_view = + lttng_payload_view_from_view( + view, 0, sizeof(*event_rule_comm)); if (!view || !event_rule) { ret = -1; goto end; } - DBG("Deserializing event_rule from payload."); - event_rule_comm = (const struct lttng_event_rule_comm *) view->buffer.data; + if (!lttng_payload_view_is_valid(&event_rule_comm_view)) { + ret = -1; + goto end; + } + + DBG("Deserializing event_rule from payload"); + event_rule_comm = (const struct lttng_event_rule_comm *) event_rule_comm_view.buffer.data; consumed += sizeof(*event_rule_comm); switch ((enum lttng_event_rule_type) event_rule_comm->event_rule_type) { @@ -234,10 +242,11 @@ void lttng_event_rule_put(struct lttng_event_rule *event_rule) LTTNG_HIDDEN enum lttng_error_code lttng_event_rule_generate_filter_bytecode( - struct lttng_event_rule *rule, uid_t uid, gid_t gid) + struct lttng_event_rule *rule, + const struct lttng_credentials *creds) { assert(rule->generate_filter_bytecode); - return rule->generate_filter_bytecode(rule, uid, gid); + return rule->generate_filter_bytecode(rule, creds); } LTTNG_HIDDEN