X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=83eb01673336fb8af82333677fcdd22998276314;hb=ca939de8e5178bd731b86d0c4588ca84cc0d16f8;hp=97677dd59e9a9a2bef55c693760b421b6b4b9b71;hpb=825535cc5864e9e7491e55cd203a643ced266658;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 97677dd59..83eb01673 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -3317,6 +3317,8 @@ skip_domain:
 	if (cmd_ctx->lsm->cmd_type == LTTNG_START_TRACE ||
 			cmd_ctx->lsm->cmd_type == LTTNG_STOP_TRACE) {
 		switch (cmd_ctx->lsm->domain.type) {
+		case LTTNG_DOMAIN_NONE:
+			break;
 		case LTTNG_DOMAIN_JUL:
 		case LTTNG_DOMAIN_LOG4J:
 		case LTTNG_DOMAIN_PYTHON:
@@ -4669,18 +4671,11 @@ 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;
-	}
-
 	if (string_match(optname, "client-sock") || opt == 'c') {
+		if (!arg || *arg == '\0') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"-c, --client-sock");
@@ -4688,6 +4683,10 @@ static int set_option(int opt, const char *arg, const char *optname)
 			snprintf(client_unix_sock_path, PATH_MAX, "%s", arg);
 		}
 	} else if (string_match(optname, "apps-sock") || opt == 'a') {
+		if (!arg || *arg == '\0') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"-a, --apps-sock");
@@ -4699,6 +4698,10 @@ static int set_option(int opt, const char *arg, const char *optname)
 	} else if (string_match(optname, "background") || opt == 'b') {
 		opt_background = 1;
 	} else if (string_match(optname, "group") || opt == 'g') {
+		if (!arg || *arg == '\0') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"-g, --group");
@@ -4731,6 +4734,10 @@ static int set_option(int opt, const char *arg, const char *optname)
 	} else if (string_match(optname, "sig-parent") || opt == 'S') {
 		opt_sig_parent = 1;
 	} else if (string_match(optname, "kconsumerd-err-sock")) {
+		if (!arg || *arg == '\0') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"--kconsumerd-err-sock");
@@ -4738,6 +4745,10 @@ static int set_option(int opt, const char *arg, const char *optname)
 			snprintf(kconsumer_data.err_unix_sock_path, PATH_MAX, "%s", arg);
 		}
 	} else if (string_match(optname, "kconsumerd-cmd-sock")) {
+		if (!arg || *arg == '\0') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"--kconsumerd-cmd-sock");
@@ -4745,6 +4756,10 @@ static int set_option(int opt, const char *arg, const char *optname)
 			snprintf(kconsumer_data.cmd_unix_sock_path, PATH_MAX, "%s", arg);
 		}
 	} else if (string_match(optname, "ustconsumerd64-err-sock")) {
+		if (!arg || *arg == '\0') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"--ustconsumerd64-err-sock");
@@ -4752,6 +4767,10 @@ static int set_option(int opt, const char *arg, const char *optname)
 			snprintf(ustconsumer64_data.err_unix_sock_path, PATH_MAX, "%s", arg);
 		}
 	} else if (string_match(optname, "ustconsumerd64-cmd-sock")) {
+		if (!arg || *arg == '\0') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"--ustconsumerd64-cmd-sock");
@@ -4759,6 +4778,10 @@ static int set_option(int opt, const char *arg, const char *optname)
 			snprintf(ustconsumer64_data.cmd_unix_sock_path, PATH_MAX, "%s", arg);
 		}
 	} else if (string_match(optname, "ustconsumerd32-err-sock")) {
+		if (!arg || *arg == '\0') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"--ustconsumerd32-err-sock");
@@ -4766,6 +4789,10 @@ static int set_option(int opt, const char *arg, const char *optname)
 			snprintf(ustconsumer32_data.err_unix_sock_path, PATH_MAX, "%s", arg);
 		}
 	} else if (string_match(optname, "ustconsumerd32-cmd-sock")) {
+		if (!arg || *arg == '\0') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"--ustconsumerd32-cmd-sock");
@@ -4792,9 +4819,13 @@ 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') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"--consumerd32-path");
@@ -4810,6 +4841,10 @@ static int set_option(int opt, const char *arg, const char *optname)
 			consumerd32_bin_override = 1;
 		}
 	} else if (string_match(optname, "consumerd32-libdir")) {
+		if (!arg || *arg == '\0') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"--consumerd32-libdir");
@@ -4825,6 +4860,10 @@ static int set_option(int opt, const char *arg, const char *optname)
 			consumerd32_libdir_override = 1;
 		}
 	} else if (string_match(optname, "consumerd64-path")) {
+		if (!arg || *arg == '\0') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"--consumerd64-path");
@@ -4840,6 +4879,10 @@ static int set_option(int opt, const char *arg, const char *optname)
 			consumerd64_bin_override = 1;
 		}
 	} else if (string_match(optname, "consumerd64-libdir")) {
+		if (!arg || *arg == '\0') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"--consumerd64-libdir");
@@ -4855,6 +4898,10 @@ static int set_option(int opt, const char *arg, const char *optname)
 			consumerd64_libdir_override = 1;
 		}
 	} else if (string_match(optname, "pidfile") || opt == 'p') {
+		if (!arg || *arg == '\0') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"-p, --pidfile");
@@ -4867,6 +4914,10 @@ static int set_option(int opt, const char *arg, const char *optname)
 			}
 		}
 	} else if (string_match(optname, "agent-tcp-port")) {
+		if (!arg || *arg == '\0') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"--agent-tcp-port");
@@ -4891,6 +4942,10 @@ static int set_option(int opt, const char *arg, const char *optname)
 			DBG3("Agent TCP port set to non default: %u", agent_tcp_port);
 		}
 	} else if (string_match(optname, "load") || opt == 'l') {
+		if (!arg || *arg == '\0') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"-l, --load");
@@ -4903,6 +4958,10 @@ static int set_option(int opt, const char *arg, const char *optname)
 			}
 		}
 	} else if (string_match(optname, "kmod-probes")) {
+		if (!arg || *arg == '\0') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"--kmod-probes");
@@ -4915,6 +4974,10 @@ static int set_option(int opt, const char *arg, const char *optname)
 			}
 		}
 	} else if (string_match(optname, "extra-kmod-probes")) {
+		if (!arg || *arg == '\0') {
+			ret = -EINVAL;
+			goto end;
+		}
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
 				"--extra-kmod-probes");
@@ -5441,7 +5504,10 @@ static int write_pidfile(void)
 	assert(rundir);
 
 	if (opt_pidfile) {
-		strncpy(pidfile_path, opt_pidfile, sizeof(pidfile_path));
+		if (lttng_strncpy(pidfile_path, opt_pidfile, sizeof(pidfile_path))) {
+			ret = -1;
+			goto error;
+		}
 	} else {
 		/* Build pidfile path from rundir and opt_pidfile. */
 		ret = snprintf(pidfile_path, sizeof(pidfile_path), "%s/"