Fix: lttng-relayd allow binding of privileged ports for non-root users

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

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 8890b52f4a1666666f987633a67a4097aec953c3..fc954d28d46cccf1a4e55ab5a938a619c822f808 100644 (file)
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -2371,7 +2371,12 @@ static int spawn_consumer_thread(struct consumer_data *consumer_data)
        int ret, clock_ret;
        struct timespec timeout;
 
-       /* Make sure we set the readiness flag to 0 because we are NOT ready */
+       /*
+        * Make sure we set the readiness flag to 0 because we are NOT ready.
+        * This access to consumer_thread_is_ready does not need to be
+        * protected by consumer_data.cond_mutex (yet) since the consumer
+        * management thread has not been started at this point.
+        */
        consumer_data->consumer_thread_is_ready = 0;
 
        /* Setup pthread condition */
@@ -4202,7 +4207,6 @@ static void *thread_manage_health(void *data)
        sock = lttcomm_create_unix_sock(health_unix_sock_path);
        if (sock < 0) {
                ERR("Unable to create health check Unix socket");
-               ret = -1;
                goto error;
        }
 
@@ -4213,7 +4217,6 @@ static void *thread_manage_health(void *data)
                if (ret < 0) {
                        ERR("Unable to set group on %s", health_unix_sock_path);
                        PERROR("chown");
-                       ret = -1;
                        goto error;
                }
 
@@ -4222,7 +4225,6 @@ static void *thread_manage_health(void *data)
                if (ret < 0) {
                        ERR("Unable to set permissions on %s", health_unix_sock_path);
                        PERROR("chmod");
-                       ret = -1;
                        goto error;
                }
        }
@@ -4819,7 +4821,7 @@ static int set_option(int opt, const char *arg, const char *optname)
                if (arg) {
                        opt_verbose_consumer = config_parse_value(arg);
                } else {
-                       opt_verbose_consumer += 1;
+                       opt_verbose_consumer++;
                }
        } else if (string_match(optname, "consumerd32-path")) {
                if (!arg || *arg == '\0') {
@@ -4924,10 +4926,6 @@ static int set_option(int opt, const char *arg, const char *optname)
                } else {
                        unsigned long v;
 
-                       if (!arg) {
-                               ret = -EINVAL;
-                               goto end;
-                       }
                        errno = 0;
                        v = strtoul(arg, NULL, 0);
                        if (errno != 0 || !isdigit(arg[0])) {