projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Memory leak in setup of relayd_path
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
health-relayd.c
diff --git
a/src/bin/lttng-relayd/health-relayd.c
b/src/bin/lttng-relayd/health-relayd.c
index 5c4fb50a15154794b76aec6284b3940479baf7ab..d34a376c53989dd314cf217c0da52e7d69f1a3e4 100644
(file)
--- a/
src/bin/lttng-relayd/health-relayd.c
+++ b/
src/bin/lttng-relayd/health-relayd.c
@@
-49,6
+49,7
@@
#include <common/compat/poll.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/utils.h>
#include <common/compat/poll.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/utils.h>
+#include <common/compat/getenv.h>
#include "lttng-relayd.h"
#include "health-relayd.h"
#include "lttng-relayd.h"
#include "health-relayd.h"
@@
-136,7
+137,7
@@
int parse_health_env(void)
{
const char *health_path;
{
const char *health_path;
- health_path = getenv(LTTNG_RELAYD_HEALTH_ENV);
+ health_path =
lttng_secure_
getenv(LTTNG_RELAYD_HEALTH_ENV);
if (health_path) {
strncpy(health_unix_sock_path, health_path,
PATH_MAX);
if (health_path) {
strncpy(health_unix_sock_path, health_path,
PATH_MAX);
@@
-150,7
+151,7
@@
static
int setup_health_path(void)
{
int is_root, ret = 0;
int setup_health_path(void)
{
int is_root, ret = 0;
- char *home_path = NULL, *rundir = NULL, *relayd_path;
+ char *home_path = NULL, *rundir = NULL, *relayd_path
= NULL
;
ret = parse_health_env();
if (ret) {
ret = parse_health_env();
if (ret) {
@@
-161,6
+162,10
@@
int setup_health_path(void)
if (is_root) {
rundir = strdup(DEFAULT_LTTNG_RUNDIR);
if (is_root) {
rundir = strdup(DEFAULT_LTTNG_RUNDIR);
+ if (!rundir) {
+ ret = -ENOMEM;
+ goto end;
+ }
} else {
/*
* Create rundir from home path. This will create something like
} else {
/*
* Create rundir from home path. This will create something like
@@
-218,6
+223,7
@@
int setup_health_path(void)
end:
free(rundir);
end:
free(rundir);
+ free(relayd_path);
return ret;
}
return ret;
}
@@
-326,6
+332,11
@@
restart:
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
+ if (!revents) {
+ /* No activity for this FD (poll implementation). */
+ continue;
+ }
+
/* Thread quit pipe has been closed. Killing thread. */
ret = check_health_quit_pipe(pollfd, revents);
if (ret) {
/* Thread quit pipe has been closed. Killing thread. */
ret = check_health_quit_pipe(pollfd, revents);
if (ret) {
This page took
0.024583 seconds
and
4
git commands to generate.