X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=92899873baebd743c5de265f795b41ae00f22498;hb=c5c1b9e6b2fe95333fb0975b8fdcd657458141ed;hp=433b15b76c7f30de89c66506df829842a238b6d4;hpb=0e904f3e714079406c39a2ad6d5bb7960b6aa6cb;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 433b15b76..92899873b 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -5348,7 +5348,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/"
@@ -6100,11 +6103,12 @@ exit_health_sessiond_cleanup:
 exit_create_run_as_worker_cleanup:
 
 exit_options:
+	/* Ensure all prior call_rcu are done. */
+	rcu_barrier();
+
 	sessiond_cleanup_options();
 
 exit_set_signal_handler:
-	/* Ensure all prior call_rcu are done. */
-	rcu_barrier();
 
 	if (!retval) {
 		exit(EXIT_SUCCESS);