From: Tim Duesterhus <tim@bastelstu.be>
Date: Sun, 25 Nov 2018 19:03:39 +0000 (+0100)
Subject: BUG/MINOR: mworker: Do not attempt to close(2) fd -1
X-Git-Tag: v1.9-dev9~146
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=742e0f9f1f6e747372e2de3dc5cd86f5414eb7c6;p=thirdparty%2Fhaproxy.git

BUG/MINOR: mworker: Do not attempt to close(2) fd -1

Valgrind reports:

==3389== Warning: invalid file descriptor -1 in syscall close()

Check for >= 0 before closing.

This bug was introduced in commit ce83b4a5dd48c000dec68f9d551945d21e9ac7ac
and is specific to 1.9. No backport needed.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 54ab7c865a..b4e12f14a9 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -3099,7 +3099,8 @@ int main(int argc, char **argv)
 				 * workers, we don't need to close the worker
 				 * side of other workers since it's done with
 				 * the bind_proc */
-				close(child->ipc_fd[0]);
+				if (child->ipc_fd[0] >= 0)
+					close(child->ipc_fd[0]);
 				if (child->relative_pid == relative_pid &&
 				    child->reloads == 0) {
 					/* keep this struct if this is our pid */