Merged! Thanks Master and backported to stable-2.4
On 04 Mar (13:45:17), Jérémie Galarneau wrote: > An unknown command currently crashes the relay daemon since > destroy_connection calls destroy_session without checking whether > or not a session is associated with the connection. > > Signed-off-by: Jérémie Galarneau <[email protected]> > --- > src/bin/lttng-relayd/main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c > index 53eaca2..a93151a 100644 > --- a/src/bin/lttng-relayd/main.c > +++ b/src/bin/lttng-relayd/main.c > @@ -2389,7 +2389,7 @@ static void destroy_connection(struct lttng_ht > *relay_connections_ht, > connection_delete(relay_connections_ht, conn); > > /* For the control socket, we try to destroy the session. */ > - if (conn->type == RELAY_CONTROL) { > + if (conn->type == RELAY_CONTROL && conn->session) { > destroy_session(conn->session, conn->sessions_ht); > } > > -- > 1.9.0 >
signature.asc
Description: Digital signature
_______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
