RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-18 01:14:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: connection: don't store recv() result into trash.data

Browse Source 
Cyril Bont discovered that the proxy protocol randomly fails since
commit 843b7cb ("MEDIUM: chunks: make the chunk struct's fields match
the buffer struct"). This is because we used to store recv()'s return
code into trash.data which is now unsigned, so it never compares as
negative against 0. Let's clean this up and test the result itself
without storing it first.

No backport is needed.
This commit is contained in:
Willy Tarreau 2018-08-22 05:20:32 +02:00
parent 2842e05c7c
commit b406b8708f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/connection.c
View File

@ -424,6 +424,7 @@ int conn_recv_proxy(struct connection *conn, int flag)
const char v2sig[] = PP2_SIGNATURE;
int tlv_length = 0;
int tlv_offset = 0;
int ret;
/* we might have been called just after an asynchronous shutr */
if (conn->flags & CO_FL_SOCK_RD_SH)
@ -436,9 +437,8 @@ int conn_recv_proxy(struct connection *conn, int flag)
return 0;
do {
trash.data = recv(conn->handle.fd, trash.area, trash.size,
MSG_PEEK);
if (trash.data < 0) {
ret = recv(conn->handle.fd, trash.area, trash.size, MSG_PEEK);
if (ret < 0) {
if (errno == EINTR)
continue;
if (errno == EAGAIN) {
@ -447,6 +447,7 @@ int conn_recv_proxy(struct connection *conn, int flag)
}
goto recv_abort;
}
trash.data = ret;
} while (0);
if (!trash.data) {
@ -738,6 +739,7 @@ int conn_recv_netscaler_cip(struct connection *conn, int flag)
char *line;
uint32_t hdr_len;
uint8_t ip_v;
int ret;
/* we might have been called just after an asynchronous shutr */
if (conn->flags & CO_FL_SOCK_RD_SH)
@ -750,9 +752,8 @@ int conn_recv_netscaler_cip(struct connection *conn, int flag)
return 0;
do {
trash.data = recv(conn->handle.fd, trash.area, trash.size,
MSG_PEEK);
if (trash.data < 0) {
ret = recv(conn->handle.fd, trash.area, trash.size, MSG_PEEK);
if (ret < 0) {
if (errno == EINTR)
continue;
if (errno == EAGAIN) {
@ -761,6 +762,7 @@ int conn_recv_netscaler_cip(struct connection *conn, int flag)
}
goto recv_abort;
}
trash.data = ret;
} while (0);
if (!trash.data) {