Fix: HT must not be destroyed with a rcu_read_lock held

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c
index a9907c45d9c264a424b59646a08c47a9ffd033d3..984073c62b6cc29ed6c300d1c7446b1273ce0585 100644 (file)
--- a/src/bin/lttng-relayd/session.c
+++ b/src/bin/lttng-relayd/session.c
@@ -153,6 +153,9 @@ void session_try_destroy(struct lttng_ht *ht, struct relay_session *session)
 
 /*
  * Destroy a session object.
+ *
+ * This function must *NOT* be called with an RCU read lock held since
+ * the session's ctf_traces_ht is destroyed.
  */
 void session_destroy(struct relay_session *session)
 {
@@ -173,8 +176,8 @@ void session_destroy(struct relay_session *session)
                ctf_trace_delete(session->ctf_traces_ht, ctf_trace);
                ctf_trace_destroy(ctf_trace);
        }
-       lttng_ht_destroy(session->ctf_traces_ht);
        rcu_read_unlock();
+       lttng_ht_destroy(session->ctf_traces_ht);
 
        call_rcu(&session->rcu_node, rcu_destroy_session);
 }