projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement --shm-path option for UST sessions (per-uid channels)
[lttng-tools.git]
/
src
/
common
/
utils.c
diff --git
a/src/common/utils.c
b/src/common/utils.c
index 1d07cb31cc01511aedb781124de609277410075d..9a53330004931408df017fb4b2ebbd87ad31a61e 100644
(file)
--- a/
src/common/utils.c
+++ b/
src/common/utils.c
@@
-18,6
+18,7
@@
*/
#define _GNU_SOURCE
*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <assert.h>
#include <ctype.h>
#include <fcntl.h>
#include <assert.h>
#include <ctype.h>
#include <fcntl.h>
@@
-34,6
+35,7
@@
#include <common/common.h>
#include <common/runas.h>
#include <common/common.h>
#include <common/runas.h>
+#include <common/compat/getenv.h>
#include "utils.h"
#include "defaults.h"
#include "utils.h"
#include "defaults.h"
@@
-90,6
+92,10
@@
char *utils_partial_realpath(const char *path, char *resolved_path, size_t size)
/* Cut the part we will be trying to resolve */
cut_path = strndup(path, next - path);
/* Cut the part we will be trying to resolve */
cut_path = strndup(path, next - path);
+ if (cut_path == NULL) {
+ PERROR("strndup");
+ goto error;
+ }
/* Try to resolve this part */
try_path = realpath((char *)cut_path, NULL);
/* Try to resolve this part */
try_path = realpath((char *)cut_path, NULL);
@@
-143,6
+149,10
@@
char *utils_partial_realpath(const char *path, char *resolved_path, size_t size)
* path are pointers for the same memory space
*/
cut_path = strdup(prev);
* path are pointers for the same memory space
*/
cut_path = strdup(prev);
+ if (cut_path == NULL) {
+ PERROR("strdup");
+ goto error;
+ }
/* Concatenate the strings */
snprintf(resolved_path, size, "%s%s", try_path_prev, cut_path);
/* Concatenate the strings */
snprintf(resolved_path, size, "%s%s", try_path_prev, cut_path);
@@
-216,7
+226,10
@@
char *utils_expand_path(const char *path)
/* We prepare the start_path not containing it */
start_path = strndup(absolute_path, next - absolute_path);
/* We prepare the start_path not containing it */
start_path = strndup(absolute_path, next - absolute_path);
-
+ if (!start_path) {
+ PERROR("strndup");
+ goto error;
+ }
/* And we concatenate it with the part after this string */
snprintf(absolute_path, PATH_MAX, "%s%s", start_path, next + 2);
/* And we concatenate it with the part after this string */
snprintf(absolute_path, PATH_MAX, "%s%s", start_path, next + 2);
@@
-233,6
+246,10
@@
char *utils_expand_path(const char *path)
/* Then we prepare the start_path not containing it */
start_path = strndup(absolute_path, previous - absolute_path);
/* Then we prepare the start_path not containing it */
start_path = strndup(absolute_path, previous - absolute_path);
+ if (!start_path) {
+ PERROR("strndup");
+ goto error;
+ }
/* And we concatenate it with the part after the '/../' */
snprintf(absolute_path, PATH_MAX, "%s%s", start_path, next + 4);
/* And we concatenate it with the part after the '/../' */
snprintf(absolute_path, PATH_MAX, "%s%s", start_path, next + 4);
@@
-461,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");
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);
DBG("Pid %d written in file %s", pid, filepath);
+ ret = 0;
error:
return ret;
}
error:
return ret;
}
@@
-496,9
+517,11
@@
int utils_create_lock_file(const char *filepath)
*/
ret = flock(fd, LOCK_EX | LOCK_NB);
if (ret) {
*/
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);
filepath);
- close(fd);
+ if (close(fd)) {
+ PERROR("close lock file");
+ }
fd = ret;
goto error;
}
fd = ret;
goto error;
}
@@
-863,11
+886,11
@@
char *utils_get_home_dir(void)
char *val = NULL;
struct passwd *pwd;
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;
}
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;
}
if (val != NULL) {
goto end;
}
@@
-932,7
+955,7
@@
end:
LTTNG_HIDDEN
char *utils_get_kmod_probes_list(void)
{
LTTNG_HIDDEN
char *utils_get_kmod_probes_list(void)
{
- return getenv(DEFAULT_LTTNG_KMOD_PROBES);
+ return
lttng_secure_
getenv(DEFAULT_LTTNG_KMOD_PROBES);
}
/*
}
/*
@@
-942,7
+965,7
@@
char *utils_get_kmod_probes_list(void)
LTTNG_HIDDEN
char *utils_get_extra_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);
}
/*
}
/*
This page took
0.025364 seconds
and
4
git commands to generate.