X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-consumerd%2Flttng-consumerd.c;h=764cf4cb0f59ff981629c99078b31676d0f700b2;hb=bec9764693f61c0ed708d94a89e15a7ee38e5c69;hp=7122d065e649aa41533d4319af9d88010d4b4890;hpb=25b397f9ccee70eb6f2968837702c50f22ad7bbf;p=lttng-tools.git

diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
index 7122d065e..764cf4cb0 100644
--- a/src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/src/bin/lttng-consumerd/lttng-consumerd.c
@@ -47,6 +47,7 @@
 #include <common/consumer.h>
 #include <common/consumer-timer.h>
 #include <common/compat/poll.h>
+#include <common/compat/getenv.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/utils.h>
 
@@ -223,16 +224,31 @@ static int parse_args(int argc, char **argv)
 			}
 			break;
 		case 'c':
-			snprintf(command_sock_path, PATH_MAX, "%s", optarg);
+			if (lttng_is_setuid_setgid()) {
+				WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
+					"-c, --consumerd-cmd-sock");
+			} else {
+				snprintf(command_sock_path, PATH_MAX, "%s", optarg);
+			}
 			break;
 		case 'e':
-			snprintf(error_sock_path, PATH_MAX, "%s", optarg);
+			if (lttng_is_setuid_setgid()) {
+				WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
+					"-e, --consumerd-err-sock");
+			} else {
+				snprintf(error_sock_path, PATH_MAX, "%s", optarg);
+			}
 			break;
 		case 'd':
 			opt_daemon = 1;
 			break;
 		case 'g':
-			tracing_group_name = optarg;
+			if (lttng_is_setuid_setgid()) {
+				WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
+					"-g, --group");
+			} else {
+				tracing_group_name = optarg;
+			}
 			break;
 		case 'h':
 			usage(stdout);
@@ -621,6 +637,9 @@ exit_health_consumerd_cleanup:
 exit_options:
 
 exit_set_signal_handler:
+	/* Ensure all prior call_rcu are done. */
+	rcu_barrier();
+
 	if (!retval) {
 		exit(EXIT_SUCCESS);
 	} else {