X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=a970012c7fde9fc90464adfd2520add2e6a3a903;hp=c8484b93cb8a7006b708f562466cffc75aa4c767;hb=f3dd7ce78597e2d8b002fcc9536aa6016d1b039f;hpb=fa64dfb477cac50bb0b8a02fcf6b5a16a426d43b

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index c8484b93c..a970012c7 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -18,6 +18,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <getopt.h>
 #include <grp.h>
 #include <limits.h>
@@ -3217,12 +3218,14 @@ skip_domain:
 
 			if (bytecode_len > LTTNG_FILTER_MAX_LEN) {
 				ret = LTTNG_ERR_FILTER_INVAL;
+				free(filter_expression);
 				free(exclusion);
 				goto error;
 			}
 
 			bytecode = zmalloc(bytecode_len);
 			if (!bytecode) {
+				free(filter_expression);
 				free(exclusion);
 				ret = LTTNG_ERR_FILTER_NOMEM;
 				goto error;
@@ -3234,6 +3237,7 @@ skip_domain:
 			if (ret <= 0) {
 				DBG("Nothing recv() from client car len data... continuing");
 				*sock_error = 1;
+				free(filter_expression);
 				free(bytecode);
 				free(exclusion);
 				ret = LTTNG_ERR_FILTER_INVAL;
@@ -3241,6 +3245,7 @@ skip_domain:
 			}
 
 			if ((bytecode->len + sizeof(*bytecode)) != bytecode_len) {
+				free(filter_expression);
 				free(bytecode);
 				free(exclusion);
 				ret = LTTNG_ERR_FILTER_INVAL;
@@ -3501,7 +3506,7 @@ skip_domain:
 	case LTTNG_LIST_CHANNELS:
 	{
 		int nb_chan;
-		struct lttng_channel *channels;
+		struct lttng_channel *channels = NULL;
 
 		nb_chan = cmd_list_channels(cmd_ctx->lsm->domain.type,
 				cmd_ctx->session, &channels);
@@ -4241,7 +4246,7 @@ static void usage(void)
 	fprintf(stderr, "      --verbose-consumer             Verbose mode for consumer. Activate DBG() macro.\n");
 	fprintf(stderr, "      --no-kernel                    Disable kernel tracer\n");
 	fprintf(stderr, "      --agent-tcp-port               Agent registration TCP port\n");
-	fprintf(stderr, "  -f  --config                       Load daemon configuration file\n");
+	fprintf(stderr, "  -f  --config PATH                  Load daemon configuration file\n");
 	fprintf(stderr, "  -l  --load PATH                    Load session configuration\n");
 	fprintf(stderr, "      --kmod-probes                  Specify kernel module probes to load\n");
 	fprintf(stderr, "      --extra-kmod-probes            Specify extra kernel module probes to load\n");
@@ -4257,6 +4262,17 @@ static int set_option(int opt, const char *arg, const char *optname)
 {
 	int ret = 0;
 
+	if (arg && arg[0] == '\0') {
+		/*
+		 * This only happens if the value is read from daemon config
+		 * file. This means the option requires an argument and the
+		 * configuration file contains a line such as:
+		 * my_option =
+		 */
+		ret = -EINVAL;
+		goto end;
+	}
+
 	switch (opt) {
 	case 0:
 		fprintf(stderr, "option %s", optname);
@@ -4448,6 +4464,23 @@ static int set_option(int opt, const char *arg, const char *optname)
 		ret = -1;
 	}
 
+end:
+	if (ret == -EINVAL) {
+		const char *opt_name = "unknown";
+		int i;
+
+		for (i = 0; i < sizeof(long_options) / sizeof(struct option);
+			i++) {
+			if (opt == long_options[i].val) {
+				opt_name = long_options[i].name;
+				break;
+			}
+		}
+
+		WARN("Invalid argument provided for option \"%s\", using default value.",
+			opt_name);
+	}
+
 	return ret;
 }
 
@@ -5078,6 +5111,10 @@ int main(int argc, char **argv)
 
 	if (is_root) {
 		rundir = strdup(DEFAULT_LTTNG_RUNDIR);
+		if (!rundir) {
+			ret = -ENOMEM;
+			goto error;
+		}
 
 		/* Create global run dir with root access */
 		ret = create_lttng_rundir(rundir);