RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-16 08:24:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: checks: segfault with external checks in a backend section

Browse Source 
The documentation indicates that external checks can be used in a backend
section, but the code requires a listener to provide information in the script
arguments.
External checks were initialized lately, during the first check, leaving some
variables uninitialized in such a scenario, which trigger the segfault when
accessed to collect errors information.

To prevent the segfault, currently we should initialize the external checks
earlier, during the process initialiation itself and quit if the error occurs.

This fix is specific to the 1.6 branch.
This commit is contained in:
Cyril Bont 2014-08-07 01:55:38 +02:00 committed by Willy Tarreau
parent 77010d8006
commit 99c5bf5ff4
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/checks.c
View File

@ -1627,7 +1627,7 @@ static int prepare_external_check(struct check *check)
if (!check->argv[i])
goto err;
return 0;
return 1;
err:
if (check->envp) {
free(check->envp[1]);
@ -1642,7 +1642,7 @@ err:
check->argv = NULL;
}
Alert(err_fmt, px->id, s->id);
return -1;
return 0;
}
/*
@ -1667,12 +1667,6 @@ static int connect_proc_chk(struct task *t)
int status;
pid_t pid;
if (!check->argv) {
status = prepare_external_check(check);
if (status < 0)
return SN_ERR_RESOURCE;
}
status = SN_ERR_RESOURCE;
block_sigchld();
@ -2140,6 +2134,10 @@ int start_checks() {
for (s = px->srv; s; s = s->next) {
/* A task for the main check */
if (s->check.state & CHK_ST_CONFIGURED) {
if (s->check.type == PR_O2_EXT_CHK) {
if (!prepare_external_check(&s->check))
return -1;
}
if (!start_check_task(&s->check, mininter, nbcheck, srvpos))
return -1;
srvpos++;