X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=696e650debb70e6c0f9724b506a1b1413f0bd3a7;hp=7baef882813e28e4ffd44bbc22fc4ab9c95d9ac8;hb=6bad3253d952934f18be50e032b3d495e7a54613;hpb=e5bbf67813693bf82d6919918fb0701431be9d0b

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 7baef8828..696e650de 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1042,7 +1042,8 @@ int cmd_disable_event(struct ltt_session *session, int domain,
 
 	event_name = event->name;
 
-	if (event->loglevel_type || event->loglevel || event->enabled
+	/* Error out on unhandled search criteria */
+	if (event->loglevel_type || event->loglevel != -1 || event->enabled
 			|| event->pid || event->filter || event->exclusion) {
 		return LTTNG_ERR_UNK;
 	}
@@ -2552,10 +2553,12 @@ ssize_t cmd_list_events(int domain, struct ltt_session *session,
 			struct lttng_ht_iter iter;
 			struct agent *agt;
 
+			rcu_read_lock();
 			cds_lfht_for_each_entry(session->ust_session->agents->ht,
 					&iter.iter, agt, node.node) {
 				nb_event = list_lttng_agent_events(agt, events);
 			}
+			rcu_read_unlock();
 		}
 		break;
 	default: