From 5d0a7bcb4407e434e2278ce3a7be2c30d00c3313 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Fri, 18 Jan 2019 12:40:47 -0500 Subject: [PATCH 1/1] Fix: create_kernel_session asserts on failure MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit create_kernel_session() will call trace_kernel_destroy_session() on failure to create a kernel session (e.g. modules failed to load). This can be reproduced by enabling kernel events on a session after the session daemon has failed to load the LTTng kernel modules. Signed-off-by: Jérémie Galarneau --- src/bin/lttng-sessiond/client.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c index 67e246b63..a889529a7 100644 --- a/src/bin/lttng-sessiond/client.c +++ b/src/bin/lttng-sessiond/client.c @@ -475,7 +475,7 @@ static int create_kernel_session(struct ltt_session *session) ret = kernel_create_session(session, kernel_tracer_fd); if (ret < 0) { ret = LTTNG_ERR_KERN_SESS_FAIL; - goto error; + goto error_create; } /* Code flow safety */ @@ -497,6 +497,7 @@ static int create_kernel_session(struct ltt_session *session) error: trace_kernel_destroy_session(session->kernel_session); session->kernel_session = NULL; +error_create: return ret; } -- 2.34.1