mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 07:37:02 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: stconn: Fix comparison sign in sc_need_room()

Browse Source 
sc_need_room() function may be called with a negative value. In this case,
the intent is to be notified if any space was made in the channel buffer. In
the function, we get the min between the requested room and the maximum
possible room in the buffer, considering it may be an HTX buffer.

However this max value is unsigned and leads to an unsigned comparison,
casting the negative value to an unsigned value. Of course, in this case,
this always leads to the wrong result. This bug seems to have no effect but
it is hard to be sure.

To fix the issue, we take care to respect the requested room sign by casting
the max value to a signed integer.

This patch must be backported to 2.8.
This commit is contained in:
Christopher Faulet 2023-08-04 10:36:06 +02:00
parent 31e8a003a5
commit a633338b55
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/stconn.h
View File

@ -457,7 +457,7 @@ static inline void sc_have_room(struct stconn *sc)
static inline void sc_need_room(struct stconn *sc, ssize_t room_needed) static inline void sc_need_room(struct stconn *sc, ssize_t room_needed)
{ {
sc->flags |= SC_FL_NEED_ROOM; sc->flags |= SC_FL_NEED_ROOM;
sc->room_needed = MIN(global.tune.bufsize - global.tune.maxrewrite - sizeof(struct htx), room_needed); sc->room_needed = MIN((ssize_t)(global.tune.bufsize - global.tune.maxrewrite - sizeof(struct htx)), room_needed);
} }
/* The stream endpoint indicates that it's ready to consume data from the /* The stream endpoint indicates that it's ready to consume data from the