X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=966f609177ad0b28104de59f827ec73f7101de24;hp=21b4cf326bd49e48f0f2a1b2caeee34554578981;hb=a9ad0c8fb50ac8cf9e9812dd9c9b4f949bac19a8;hpb=bd39b88b61f8a17e1ca4c49706fe047d9253fb23

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 21b4cf326..966f60917 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -994,10 +994,30 @@ static void update_ust_app(int app_sock)
 
 	/* For all tracing session(s) */
 	cds_list_for_each_entry_safe(sess, stmp, &session_list_ptr->head, list) {
+		struct ust_app *app;
+
 		session_lock(sess);
-		if (sess->ust_session) {
-			ust_app_global_update(sess->ust_session, app_sock);
+		if (!sess->ust_session) {
+			goto unlock_session;
 		}
+
+		rcu_read_lock();
+		assert(app_sock >= 0);
+		app = ust_app_find_by_sock(app_sock);
+		if (app == NULL) {
+			/*
+			 * Application can be unregistered before so
+			 * this is possible hence simply stopping the
+			 * update.
+			 */
+			DBG3("UST app update failed to find app sock %d",
+				app_sock);
+			goto unlock_rcu;
+		}
+		ust_app_global_update(sess->ust_session, app);
+	unlock_rcu:
+		rcu_read_unlock();
+	unlock_session:
 		session_unlock(sess);
 	}
 }