mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-03-25 00:42:04 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: connection/ssl: also fix the ssl_sock_io_cb() regarding idle list

Browse Source 
The fix in commit 9481cef948 ("BUG/MEDIUM: connection: do not reinsert a
purgeable conn in idle list") is also needed for ssl_sock_io_cb() which
can also release an idle connection and must perform the same checks.
This fix must be backported to all stable versions containing the fix
above.
This commit is contained in:
Willy Tarreau 2025-11-20 16:08:29 +01:00 committed by Amaury Denoyelle
parent 6aa236e964
commit 05c409f1be
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ssl_sock.c
View File

@ -6831,15 +6831,19 @@ struct task *ssl_sock_io_cb(struct task *t, void *context, unsigned int state)
/* Remove the connection from the list, to be sure nobody attempts
* to use it while we handle the I/O events
*/
conn_in_list = conn->flags & (CO_FL_LIST_MASK|CO_FL_SESS_IDLE);
if (conn_in_list) {
if (conn->flags & CO_FL_SESS_IDLE) {
if (!session_detach_idle_conn(conn->owner, conn))
conn_in_list = 0;
}
else {
conn_delete_from_tree(conn, tid);
}
if (LIST_INLIST(&conn->idle_list)) {
conn_in_list = 1;
BUG_ON(!(conn->flags & CO_FL_LIST_MASK));
conn_delete_from_tree(conn, tid);
}
else if (LIST_INLIST(&conn->sess_el)) {
conn_in_list = 1;
BUG_ON(!(conn->flags & CO_FL_SESS_IDLE));
/* session_detach_idle_conn cannot fail thanks to LIST_INLIST() above test */
session_detach_idle_conn(conn->owner, conn);
}
else {
conn_in_list = 0;
}
HA_SPIN_UNLOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
@ -6962,9 +6966,9 @@ leave:
}
}
else {
ASSUME_NONNULL(srv); /* srv is guaranteed by CO_FL_LIST_MASK */
ASSUME_NONNULL(srv); /* srv is guaranteed to be non-null if conn is in idle list */
TRACE_DEVEL("adding conn back to idle list", SSL_EV_CONN_IO_CB, conn);
srv_add_idle(srv, conn, conn_in_list == CO_FL_SAFE_LIST);
srv_add_idle(srv, conn, (conn->flags & CO_FL_LIST_MASK) == CO_FL_SAFE_LIST);
}
}
else {