X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Futils.c;h=9a53330004931408df017fb4b2ebbd87ad31a61e;hp=365510b3c37de51bacdeafee888b7f87e9776ac5;hb=d7ba13889c8692b14f99238ddf2721ed78df89d2;hpb=d9dbcf5efef2ff10ebb89d0272af4a76a7141a58

diff --git a/src/common/utils.c b/src/common/utils.c
index 365510b3c..9a5333000 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -35,6 +35,7 @@
 
 #include <common/common.h>
 #include <common/runas.h>
+#include <common/compat/getenv.h>
 
 #include "utils.h"
 #include "defaults.h"
@@ -477,10 +478,14 @@ int utils_create_pid_file(pid_t pid, const char *filepath)
 	ret = fprintf(fp, "%d\n", pid);
 	if (ret < 0) {
 		PERROR("fprintf pid file");
+		goto error;
 	}
 
-	fclose(fp);
+	if (fclose(fp)) {
+		PERROR("fclose");
+	}
 	DBG("Pid %d written in file %s", pid, filepath);
+	ret = 0;
 error:
 	return ret;
 }
@@ -512,9 +517,11 @@ int utils_create_lock_file(const char *filepath)
 	 */
 	ret = flock(fd, LOCK_EX | LOCK_NB);
 	if (ret) {
-		WARN("Could not get lock file %s, another instance is running.",
+		ERR("Could not get lock file %s, another instance is running.",
 			filepath);
-		close(fd);
+		if (close(fd)) {
+			PERROR("close lock file");
+		}
 		fd = ret;
 		goto error;
 	}
@@ -879,11 +886,11 @@ char *utils_get_home_dir(void)
 	char *val = NULL;
 	struct passwd *pwd;
 
-	val = getenv(DEFAULT_LTTNG_HOME_ENV_VAR);
+	val = lttng_secure_getenv(DEFAULT_LTTNG_HOME_ENV_VAR);
 	if (val != NULL) {
 		goto end;
 	}
-	val = getenv(DEFAULT_LTTNG_FALLBACK_HOME_ENV_VAR);
+	val = lttng_secure_getenv(DEFAULT_LTTNG_FALLBACK_HOME_ENV_VAR);
 	if (val != NULL) {
 		goto end;
 	}
@@ -948,7 +955,7 @@ end:
 LTTNG_HIDDEN
 char *utils_get_kmod_probes_list(void)
 {
-	return getenv(DEFAULT_LTTNG_KMOD_PROBES);
+	return lttng_secure_getenv(DEFAULT_LTTNG_KMOD_PROBES);
 }
 
 /*
@@ -958,7 +965,7 @@ char *utils_get_kmod_probes_list(void)
 LTTNG_HIDDEN
 char *utils_get_extra_kmod_probes_list(void)
 {
-	return getenv(DEFAULT_LTTNG_EXTRA_KMOD_PROBES);
+	return lttng_secure_getenv(DEFAULT_LTTNG_EXTRA_KMOD_PROBES);
 }
 
 /*