mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 05:41:26 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: quic: Missing STREAM frame type updated

Browse Source 
This patch follows this commit which was not sufficient:
  BUG/MINOR: quic: Missing STREAM frame data pointer updates

Indeed, after updating the ->offset field, the bit which informs the
frame builder of its presence must be systematically set.

This bug was revealed by the following BUG_ON() from
quic_build_stream_frame() :
  bug condition "!!(frm->type & 0x04) != !!stream->offset.key" matched at src/quic_frame.c:515

This should fix the last crash occured on github issue #2074.

Must be backported to 2.6 and 2.7.
This commit is contained in:
Frédéric Lécaille 2023-03-20 14:32:59 +01:00 committed by Amaury Denoyelle
parent 821581c990
commit c425e03b28
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/haproxy/quic_frame.h
View File

@ -255,11 +255,15 @@ static inline void qc_frm_free(struct quic_frame **frm)
} }
/* Move forward <strm> STREAM frame by <data> bytes. */ /* Move forward <strm> STREAM frame by <data> bytes. */
static inline void qc_stream_frm_mv_fwd(struct quic_stream *strm, uint64_t data) static inline void qc_stream_frm_mv_fwd(struct quic_frame *frm, uint64_t data)
{ {
struct quic_stream *strm = &frm->stream;
struct buffer cf_buf; struct buffer cf_buf;
/* Set offset bit if not already there. */
strm->offset.key += data; strm->offset.key += data;
frm->type |= QUIC_STREAM_FRAME_TYPE_OFF_BIT;
strm->len -= data; strm->len -= data;
cf_buf = b_make(b_orig(strm->buf), cf_buf = b_make(b_orig(strm->buf),
b_size(strm->buf), b_size(strm->buf),

6
src/quic_conn.c
View File

@ -1905,7 +1905,7 @@ static inline int qc_requeue_nacked_pkt_tx_frms(struct quic_conn *qc,
else if (strm_frm->offset.key < stream_desc->ack_offset) { else if (strm_frm->offset.key < stream_desc->ack_offset) {
uint64_t diff = stream_desc->ack_offset - strm_frm->offset.key; uint64_t diff = stream_desc->ack_offset - strm_frm->offset.key;
qc_stream_frm_mv_fwd(strm_frm, diff); qc_stream_frm_mv_fwd(frm, diff);
TRACE_DEVEL("updated partially acked frame", TRACE_DEVEL("updated partially acked frame",
QUIC_EV_CONN_PRSAFRM, qc, frm); QUIC_EV_CONN_PRSAFRM, qc, frm);
} }
@ -2562,7 +2562,7 @@ static void qc_dup_pkt_frms(struct quic_conn *qc,
else if (strm_frm->offset.key < stream_desc->ack_offset) { else if (strm_frm->offset.key < stream_desc->ack_offset) {
uint64_t diff = stream_desc->ack_offset - strm_frm->offset.key; uint64_t diff = stream_desc->ack_offset - strm_frm->offset.key;
qc_stream_frm_mv_fwd(strm_frm, diff); qc_stream_frm_mv_fwd(frm, diff);
TRACE_DEVEL("updated partially acked frame", TRACE_DEVEL("updated partially acked frame",
QUIC_EV_CONN_PRSAFRM, qc, frm); QUIC_EV_CONN_PRSAFRM, qc, frm);
} }
@ -7301,7 +7301,7 @@ static inline int qc_build_frms(struct list *outlist, struct list *inlist,
else if (strm->offset.key < stream_desc->ack_offset) { else if (strm->offset.key < stream_desc->ack_offset) {
uint64_t diff = stream_desc->ack_offset - strm->offset.key; uint64_t diff = stream_desc->ack_offset - strm->offset.key;
qc_stream_frm_mv_fwd(strm, diff); qc_stream_frm_mv_fwd(cf, diff);
TRACE_DEVEL("updated partially acked frame", TRACE_DEVEL("updated partially acked frame",
QUIC_EV_CONN_PRSAFRM, qc, cf); QUIC_EV_CONN_PRSAFRM, qc, cf);
} }