mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-30 15:21:04 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: mux-quic: check access on qcs stream-endpoint

Browse Source 
Since the following commit, allocation of stream-endpoint has been
delayed. The objective is to allocate it only for QCS attached to an
upper stream object.

  commit e6064c561684d9b079e3b5725d38dc3b5c1b5cd5
  OPTIM: mux-quic: delay FE sedesc alloc to stream creation

However, some MUX functions are unsafe as qcs->sd is dereferenced
without any check on it which will result in a crash. Fix this by
testing that qcs->sd is allocated before using it.

This does not need to be backported, unless the above patch is.
This commit is contained in:
Amaury Denoyelle 2025-11-21 11:06:38 +01:00
parent 91f479604e
commit bbd83e3de9
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mux_quic.c
View File

@ -2237,16 +2237,18 @@ int qcc_recv_stop_sending(struct qcc *qcc, uint64_t id, uint64_t err)
} }
} }
/* Manually set EOS if FIN already reached as futures RESET_STREAM will be ignored in this case. */ if (qcs->sd) {
if (qcs_sc(qcs) && se_fl_test(qcs->sd, SE_FL_EOI)) { /* Manually set EOS if FIN already reached as futures RESET_STREAM will be ignored in this case. */
se_fl_set(qcs->sd, SE_FL_EOS); if (qcs_sc(qcs) && se_fl_test(qcs->sd, SE_FL_EOI)) {
qcs_alert(qcs); se_fl_set(qcs->sd, SE_FL_EOS);
} qcs_alert(qcs);
}
/* If not defined yet, set abort info for the sedesc */ /* If not defined yet, set abort info for the sedesc */
if (!qcs->sd->abort_info.info) { if (!qcs->sd->abort_info.info) {
qcs->sd->abort_info.info = (SE_ABRT_SRC_MUX_QUIC << SE_ABRT_SRC_SHIFT); qcs->sd->abort_info.info = (SE_ABRT_SRC_MUX_QUIC << SE_ABRT_SRC_SHIFT);
qcs->sd->abort_info.code = err; qcs->sd->abort_info.code = err;
}
} }
/* RFC 9000 3.5. Solicited State Transitions /* RFC 9000 3.5. Solicited State Transitions
@ -3075,7 +3077,7 @@ static void qcc_wait_for_hs(struct qcc *qcc)
node = eb64_first(&qcc->streams_by_id); node = eb64_first(&qcc->streams_by_id);
while (node) { while (node) {
qcs = container_of(node, struct qcs, by_id); qcs = container_of(node, struct qcs, by_id);
if (se_fl_test(qcs->sd, SE_FL_WAIT_FOR_HS)) if (qcs_sc(qcs) && se_fl_test(qcs->sd, SE_FL_WAIT_FOR_HS))
qcs_notify_recv(qcs); qcs_notify_recv(qcs);
node = eb64_next(node); node = eb64_next(node);
} }