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

diff --git a/src/common/event-rule/uprobe.c b/src/common/event-rule/uprobe.c
index 8d63975ab..de4ee1cb0 100644
--- a/src/common/event-rule/uprobe.c
+++ b/src/common/event-rule/uprobe.c
@@ -6,11 +6,14 @@
  */
 
 #include <assert.h>
+#include <common/credentials.h>
 #include <common/error.h>
 #include <common/macros.h>
 #include <common/payload.h>
 #include <common/payload-view.h>
 #include <common/runas.h>
+#include <common/hashtable/hashtable.h>
+#include <common/hashtable/utils.h>
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/event-rule/uprobe-internal.h>
 #include <lttng/userspace-probe-internal.h>
@@ -138,7 +141,8 @@ end:
 }
 
 static enum lttng_error_code lttng_event_rule_uprobe_generate_filter_bytecode(
-		struct lttng_event_rule *rule, uid_t uid, gid_t gid)
+		struct lttng_event_rule *rule,
+		const struct lttng_credentials *creds)
 {
 	/* Nothing to do. */
 	return LTTNG_OK;
@@ -158,14 +162,32 @@ lttng_event_rule_uprobe_get_filter_bytecode(const struct lttng_event_rule *rule)
 	return NULL;
 }
 
-static struct lttng_event_exclusion *
-lttng_event_rule_uprobe_generate_exclusions(const struct lttng_event_rule *rule)
+static enum lttng_event_rule_generate_exclusions_status
+lttng_event_rule_uprobe_generate_exclusions(const struct lttng_event_rule *rule,
+		struct lttng_event_exclusion **exclusions)
 {
 	/* Unsupported. */
-	return NULL;
+	*exclusions = NULL;
+	return LTTNG_EVENT_RULE_GENERATE_EXCLUSIONS_STATUS_NONE;
 }
 
-struct lttng_event_rule *lttng_event_rule_uprobe_create()
+static unsigned long
+lttng_event_rule_uprobe_hash(
+		const struct lttng_event_rule *rule)
+{
+	unsigned long hash;
+	struct lttng_event_rule_uprobe *urule =
+			container_of(rule, typeof(*urule), parent);
+
+	hash = hash_key_ulong((void *) LTTNG_EVENT_RULE_TYPE_UPROBE,
+			lttng_ht_seed);
+	hash ^= hash_key_str(urule->name, lttng_ht_seed);
+	hash ^= lttng_userspace_probe_location_hash(urule->location);
+
+	return hash;
+}
+
+struct lttng_event_rule *lttng_event_rule_uprobe_create(void)
 {
 	struct lttng_event_rule *rule = NULL;
 	struct lttng_event_rule_uprobe *urule;
@@ -188,6 +210,7 @@ struct lttng_event_rule *lttng_event_rule_uprobe_create()
 			lttng_event_rule_uprobe_get_filter_bytecode;
 	urule->parent.generate_exclusions =
 			lttng_event_rule_uprobe_generate_exclusions;
+	urule->parent.hash = lttng_event_rule_uprobe_hash;
 end:
 	return rule;
 }
@@ -211,24 +234,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 +257,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 +273,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);