1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG/MINOR: mux-h2: prevent past scheduling with idle connections

Browse Source 
While reviewing HTTP/2 MUX timeout, it seems there is a possibility that
MUX task is requeued via h2c_update_timeout() with an already expired
date. This can happens with idle connections on two cases :
* first with shut timeout, as timer is not refreshed if already set
* second with http-request and keep-alive timers, which are based on
  idle_start

Queuing an already expired task is an undefined behavior. Fix this by
using task_wakeup() instead of task_queue() at the end of
h2c_update_timeout() if such case occurs.

This should be backported up to 2.6.
This commit is contained in:
Amaury Denoyelle 2025-04-09 14:26:54 +02:00
parent b81ab159a6
commit 3ebdd3ae50
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mux_h2.c
View File

@ -921,6 +921,16 @@ static void h2c_update_timeout(struct h2c *h2c)
} else {
h2c->task->expire = TICK_ETERNITY;
}
/* Timer may already be expired, in this case it must not be requeued.
* Currently it may happen with idle conn calculation based on shut or
* http-req/ka timeouts.
*/
if (unlikely(tick_is_expired(h2c->task->expire, now_ms))) {
task_wakeup(h2c->task, TASK_WOKEN_TIMER);
goto leave;
}
task_queue(h2c->task);
leave:
TRACE_LEAVE(H2_EV_H2C_WAKE);