projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: create_kernel_session asserts on failure
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
client.c
diff --git
a/src/bin/lttng-sessiond/client.c
b/src/bin/lttng-sessiond/client.c
index 8cf28a9d6323b4859b9563a374422be5489a7484..a889529a76967f881c9c05159ccdb55300336f51 100644
(file)
--- 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;
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 */
}
/* 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:
trace_kernel_destroy_session(session->kernel_session);
session->kernel_session = NULL;
+error_create:
return ret;
}
return ret;
}
@@
-884,7
+885,7
@@
static int process_client_msg(struct command_ctx *cmd_ctx, int sock,
if (need_tracing_session) {
if (cmd_ctx->session->kernel_session == NULL) {
ret = create_kernel_session(cmd_ctx->session);
if (need_tracing_session) {
if (cmd_ctx->session->kernel_session == NULL) {
ret = create_kernel_session(cmd_ctx->session);
- if (ret
< 0
) {
+ if (ret
!= LTTNG_OK
) {
ret = LTTNG_ERR_KERN_SESS_FAIL;
goto error;
}
ret = LTTNG_ERR_KERN_SESS_FAIL;
goto error;
}
This page took
0.024615 seconds
and
4
git commands to generate.