X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=038716cf567c03e7b03cd8f9ae0d292f7696a7c4;hb=df4f5a87a21110a5f9447bcfd7ffeb25098a5fd4;hp=9cc91cc4006615b0d3aa171cec01e2d3ee8faec8;hpb=18aeca0536f05906bf4364bc831fd7c769f60608;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index 9cc91cc40..038716cf5 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -928,7 +928,10 @@ int evaluate_condition_for_client(const struct lttng_trigger *trigger,
 		ret = -1;
 		goto end;
 	}
-
+	if (ret) {
+		/* Fatal error. */
+		goto end;
+	}
 	if (!evaluation) {
 		/* Evaluation yielded nothing. Normal exit. */
 		DBG("[notification-thread] Newly subscribed-to condition evaluated to false, nothing to report to client");
@@ -1860,8 +1863,7 @@ int condition_is_supported(struct lttng_condition *condition)
 		 * buffers. Therefore, we reject triggers that require that
 		 * mechanism to be available to be evaluated.
 		 */
-		ret = kernel_supports_ring_buffer_snapshot_sample_positions(
-				kernel_tracer_fd);
+		ret = kernel_supports_ring_buffer_snapshot_sample_positions();
 		break;
 	}
 	default:
@@ -1931,6 +1933,7 @@ int bind_trigger_to_matching_channels(const struct lttng_trigger *trigger,
 			channels_ht_node) {
 		struct lttng_trigger_list_element *trigger_list_element;
 		struct lttng_channel_trigger_list *trigger_list;
+		struct cds_lfht_iter lookup_iter;
 
 		if (!trigger_applies_to_channel(trigger, channel)) {
 			continue;
@@ -1940,8 +1943,8 @@ int bind_trigger_to_matching_channels(const struct lttng_trigger *trigger,
 				hash_channel_key(&channel->key),
 				match_channel_trigger_list,
 				&channel->key,
-				&iter);
-		node = cds_lfht_iter_get_node(&iter);
+				&lookup_iter);
+		node = cds_lfht_iter_get_node(&lookup_iter);
 		assert(node);
 		trigger_list = caa_container_of(node,
 				struct lttng_channel_trigger_list,
@@ -2543,6 +2546,7 @@ int handle_notification_thread_trigger_unregister_all(
 	struct cds_lfht_iter iter;
 	struct lttng_trigger_ht_element *trigger_ht_element;
 
+	rcu_read_lock();
 	cds_lfht_for_each_entry(state->triggers_ht, &iter, trigger_ht_element,
 			node) {
 		int ret = handle_notification_thread_command_unregister_trigger(
@@ -2551,6 +2555,7 @@ int handle_notification_thread_trigger_unregister_all(
 			error_occurred = true;
 		}
 	}
+	rcu_read_unlock();
 	return error_occurred ? -1 : 0;
 }