From: William Lallemand <wlallemand@haproxy.com>
Date: Sat, 15 Dec 2018 21:34:31 +0000 (+0100)
Subject: BUG/MEDIUM: threads: don't close the thread waker pipe if not init
X-Git-Tag: v1.9-dev11~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=808e1b7c40550510bb6c1be72e5bc99c019c336b;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: threads: don't close the thread waker pipe if not init

This bugfix concerns the thread deinit but affects the master process.

When the master process falls in wait mode (it fails to reload the
configuration), it launches the deinit_pollers_per_thread and close the
thread waker pipe. It closes rd (-1) and wr (0).

Closing a FD in the master can have several sides effects and the
process will probably quit at some point.

In this case it assigns 0 to the socketpair of a worker during the next
correct reload, and then closes the socketpair once it falls in wait
mode again. The worker assumes that the master died and leaves.
---

diff --git a/src/fd.c b/src/fd.c
index a787a0957b..84cb9080c2 100644
--- a/src/fd.c
+++ b/src/fd.c
@@ -503,8 +503,15 @@ static void deinit_pollers_per_thread()
 {
 	free(fd_updt);
 	fd_updt = NULL;
-	close(poller_rd_pipe);
-	close(poller_wr_pipe[tid]);
+
+	/* rd and wr are init at the same place, but only rd is init to -1, so
+	  we rely to rd to close.   */
+	if (poller_rd_pipe > -1) {
+		close(poller_rd_pipe);
+		poller_rd_pipe = -1;
+		close(poller_wr_pipe[tid]);
+		poller_wr_pipe[tid] = -1;
+	}
 }
 
 /*