From: William Lallemand <wlallemand@haproxy.org>
Date: Mon, 25 Jul 2022 13:51:30 +0000 (+0200)
Subject: BUG/MINOR: sockpair: wrong return value for fd_send_uxst()
X-Git-Tag: v2.7-dev3~67
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f67e8fb92c795808f60b2406ae395ebc0ca180c5;p=thirdparty%2Fhaproxy.git

BUG/MINOR: sockpair: wrong return value for fd_send_uxst()

The fd_send_uxst() function which is used to send a socket over the
socketpair returns 1 upon error instead of -1, which means the error
case of the sendmsg() is never catched correctly.

Must be backported as far as 1.9.
---

diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index 282a094bf3..60880b2905 100644
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -246,7 +246,7 @@ int send_fd_uxst(int fd, int send_fd)
 
 	if (sendmsg(fd, &msghdr, 0) != sizeof(iobuf)) {
 		ha_warning("Failed to transfer socket\n");
-		return 1;
+		return -1;
 	}
 
 	return 0;