RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-13 06:54:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: cli: make "show fd" thread-safe

Browse Source 
The "show fd" command was implemented as a debugging aid but it's not
thread safe. Its features have grown, it can now dump some mux-specific
parts and is being used in production to capture some useful debugging
traces. But it will quickly crash the process when used during an H2 load
test for example, especially when haproxy is built with the DEBUG_UAF
option. It cannot afford not to be thread safe anymore. Let's make use
of the new rendez-vous point using thread_isolate() / thread_release()
to ensure that the data being dumped are not changing under us. The dump
becomes slightly slower under load but now it's safe.

This should be backported to 1.8 along with the rendez-vous point code
once considered stable enough.
This commit is contained in:
Willy Tarreau 2018-08-02 11:05:48 +02:00
parent 60b639ccbe
commit bf9fd65088
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cli.c
View File

@ -847,10 +847,14 @@ static int cli_io_handler_show_fd(struct appctx *appctx)
void *ctx = NULL;
uint32_t conn_flags = 0;
thread_isolate();
fdt = fdtab[fd];
if (!fdt.owner)
if (!fdt.owner) {
thread_release();
goto skip; // closed
}
if (fdt.iocb == conn_fd_handler) {
conn_flags = ((struct connection *)fdt.owner)->flags;
@ -916,6 +920,8 @@ static int cli_io_handler_show_fd(struct appctx *appctx)
li->bind_conf->frontend->id);
}
thread_release();
chunk_appendf(&trash, "\n");
if (ci_putchk(si_ic(si), &trash) == -1) {