RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-26 15:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: mworker: fix validity check for the pipe FDs

Browse Source 
Check if master-worker pipe getenv succeeded, also allow pipe fd 0 as
valid. On FreeBSD in quiet mode the stdin/stdout/stderr are closed
which lets the mworker_pipe to use fd 0 and fd 1. Additionally exit()
upon failure to create or get the master-worker pipe.

This needs to be backported to 1.8.
This commit is contained in:
PiBa-NL 2017-11-28 23:22:14 +01:00 committed by Willy Tarreau
parent 721d8e0286
commit 4763ffdf04
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/haproxy.c
View File

@ -2680,7 +2680,8 @@ int main(int argc, char **argv)
/* master pipe to ensure the master is still alive */ /* master pipe to ensure the master is still alive */
ret = pipe(mworker_pipe); ret = pipe(mworker_pipe);
if (ret < 0) { if (ret < 0) {
ha_warning("[%s.main()] Cannot create master pipe.\n", argv[0]); ha_alert("[%s.main()] Cannot create master pipe.\n", argv[0]);
exit(EXIT_FAILURE);
} else { } else {
memprintf(&msg, "%d", mworker_pipe[0]); memprintf(&msg, "%d", mworker_pipe[0]);
setenv("HAPROXY_MWORKER_PIPE_RD", msg, 1); setenv("HAPROXY_MWORKER_PIPE_RD", msg, 1);
@ -2689,11 +2690,15 @@ int main(int argc, char **argv)
free(msg); free(msg);
} }
} else { } else {
mworker_pipe[0] = atol(getenv("HAPROXY_MWORKER_PIPE_RD")); char* rd = getenv("HAPROXY_MWORKER_PIPE_RD");
mworker_pipe[1] = atol(getenv("HAPROXY_MWORKER_PIPE_WR")); char* wr = getenv("HAPROXY_MWORKER_PIPE_WR");
if (mworker_pipe[0] <= 0 || mworker_pipe[1] <= 0) { if (!rd || !wr) {
ha_warning("[%s.main()] Cannot get master pipe FDs.\n", argv[0]); ha_alert("[%s.main()] Cannot get master pipe FDs.\n", argv[0]);
atexit_flag = 0;// dont reexecute master process
exit(EXIT_FAILURE);
} }
mworker_pipe[0] = atoi(rd);
mworker_pipe[1] = atoi(wr);
} }
} }