X-Git-Url: http://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fkprobe.c;h=6ec5cd402df5c590ab115a1384d6e5e34ec161b9;hp=a5c93e653f08784dbb4af8997dc1d14c66ba80c9;hb=a3ecaea889e67f87307cc3be53e51fb472a67c3b;hpb=077192fd1880652a61400b493a0b6cf5bb199435

diff --git a/src/common/event-rule/kprobe.c b/src/common/event-rule/kprobe.c
index a5c93e653..6ec5cd402 100644
--- a/src/common/event-rule/kprobe.c
+++ b/src/common/event-rule/kprobe.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 <ctype.h>
 #include <lttng/constant.h>
 #include <lttng/event-rule/event-rule-internal.h>
@@ -146,7 +149,8 @@ end:
 }
 
 static enum lttng_error_code lttng_event_rule_kprobe_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;
@@ -173,7 +177,23 @@ lttng_event_rule_kprobe_generate_exclusions(const struct lttng_event_rule *rule)
 	return NULL;
 }
 
-struct lttng_event_rule *lttng_event_rule_kprobe_create()
+static unsigned long
+lttng_event_rule_kprobe_hash(
+		const struct lttng_event_rule *rule)
+{
+	unsigned long hash;
+	struct lttng_event_rule_kprobe *krule =
+			container_of(rule, typeof(*krule), parent);
+
+	hash = hash_key_ulong((void *) LTTNG_EVENT_RULE_TYPE_KPROBE,
+			lttng_ht_seed);
+	hash ^= hash_key_str(krule->name, lttng_ht_seed);
+	hash ^= lttng_kernel_probe_location_hash(krule->location);
+
+	return hash;
+}
+
+struct lttng_event_rule *lttng_event_rule_kprobe_create(void)
 {
 	struct lttng_event_rule *rule = NULL;
 	struct lttng_event_rule_kprobe *krule;
@@ -196,6 +216,7 @@ struct lttng_event_rule *lttng_event_rule_kprobe_create()
 			lttng_event_rule_kprobe_get_filter_bytecode;
 	krule->parent.generate_exclusions =
 			lttng_event_rule_kprobe_generate_exclusions;
+	krule->parent.hash = lttng_event_rule_kprobe_hash;
 end:
 	return rule;
 }
@@ -219,19 +240,15 @@ ssize_t lttng_event_rule_kprobe_create_from_payload(
 		goto end;
 	}
 
-	if (view->buffer.size < sizeof(*kprobe_comm)) {
+	current_buffer_view = lttng_buffer_view_from_view(
+			&view->buffer, offset, sizeof(*kprobe_comm));
+	if (!lttng_buffer_view_is_valid(&current_buffer_view)) {
 		ERR("Failed to initialize from malformed event rule kprobe: buffer too short to contain header.");
 		ret = -1;
 		goto end;
 	}
 
-	current_buffer_view = lttng_buffer_view_from_view(
-			&view->buffer, offset, sizeof(*kprobe_comm));
 	kprobe_comm = (typeof(kprobe_comm)) current_buffer_view.data;
-	if (!kprobe_comm) {
-		ret = -1;
-		goto end;
-	}
 
 	rule = lttng_event_rule_kprobe_create();
 	if (!rule) {
@@ -251,12 +268,12 @@ ssize_t lttng_event_rule_kprobe_create_from_payload(
 				lttng_payload_view_from_view(view, offset,
 						kprobe_comm->name_len);
 
-		name = current_payload_view.buffer.data;
-		if (!name) {
+		if (!lttng_payload_view_is_valid(&current_payload_view)) {
 			ret = -1;
 			goto end;
 		}
 
+		name = current_payload_view.buffer.data;
 		if (!lttng_buffer_view_contains_string(
 				&current_payload_view.buffer, name,
 				kprobe_comm->name_len)) {
@@ -274,6 +291,11 @@ ssize_t lttng_event_rule_kprobe_create_from_payload(
 				lttng_payload_view_from_view(view, offset,
 						kprobe_comm->location_len);
 
+		if (!lttng_payload_view_is_valid(&current_payload_view)) {
+			ret = -1;
+			goto end;
+		}
+
 		ret = lttng_kernel_probe_location_create_from_payload(
 				&current_payload_view, &location);
 		if (ret < 0) {