Fix: Use after free on spawn_sessiond error path in check_sessiond

[lttng-tools.git] / src / bin / lttng / lttng.c

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index e6ca9cfd9877485339188fbbbf1626f0a8d21ae7..be673f94f2d0ab552c4f9daa3f90bff70637b2d1 100644 (file)
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -74,8 +74,8 @@ static struct cmd_struct commands[] =  {
        { "version", cmd_version},
        { "calibrate", cmd_calibrate},
        { "view", cmd_view},
-       { "enable-consumer", cmd_enable_consumer},
-       { "disable-consumer", cmd_disable_consumer},
+       { "enable-consumer", cmd_enable_consumer}, /* OBSELETE */
+       { "disable-consumer", cmd_disable_consumer}, /*OBSELETE */
        { NULL, NULL}   /* Array closure */
 };
 
@@ -103,8 +103,6 @@ static void usage(FILE *ofp)
        fprintf(ofp, "    enable-event      Enable tracing event\n");
        fprintf(ofp, "    disable-channel   Disable tracing channel\n");
        fprintf(ofp, "    disable-event     Disable tracing event\n");
-       fprintf(ofp, "    enable-consumer   Enable local or streaming consumer\n");
-       fprintf(ofp, "    disable-consumer  Disable consumer\n");
        fprintf(ofp, "    list              List possible tracing options\n");
        fprintf(ofp, "    set-session       Set current session name\n");
        fprintf(ofp, "    start             Start tracing\n");
@@ -376,13 +374,12 @@ static int check_sessiond(void)
                }
 
                ret = spawn_sessiond(pathname);
-               free(alloc_pathname);
                if (ret < 0) {
                        ERR("Problem occurred when starting %s", pathname);
-                       goto end;
                }
-       }
 
+               free(alloc_pathname);
+       }
 end:
        return ret;
 }