Skip to content

Commit fba80c7

Browse files
committed
BUG/MINOR: quic: ignore AGAIN ncbuf err when parsing CRYPTO frames
This fix follows this previous one: BUG/MINOR: quic: reorder fragmented RX CRYPTO frames by their offsets which is not sufficient when a client fragments and mixes its CRYPTO frames AND leaveswith holes by packets. ngtcp2 (and perhaps chrome) splits theire CRYPTO frames but without hole by packet. In such a case, the CRYPTO parsing leads to QUIC_RX_RET_FRM_AGAIN errors which cannot be fixed when the peer resends its packets. Indeed, even if the peer resends its frames in a different order, this does not help because since the previous commit, the CRYPTO frames are ordered on haproxy side. This issue was detected thanks to the interopt tests with quic-go as client. This client fragments its CRYPTO frames, mixes them, and generate holes, and most of the times with the retry test. To fix this, when a QUIC_RX_RET_FRM_AGAIN error is encountered, the CRYPTO frames parsing is not stop. This leaves chances to the next CRYPTO frames to be parsed. Must be backported as far as 2.6 as the commit mentioned above.
1 parent 26776c7 commit fba80c7

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/quic_rx.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@ static int qc_parse_pkt_frms(struct quic_conn *qc, struct quic_rx_packet *pkt,
825825
struct quic_frame *frm = NULL;
826826
const unsigned char *pos, *end;
827827
enum quic_rx_ret_frm ret;
828-
int fast_retrans = 0;
828+
int fast_retrans = 0, cf_err = 0;
829829

830830
TRACE_ENTER(QUIC_EV_CONN_PRSHPKT, qc);
831831
/* Skip the AAD */
@@ -1107,9 +1107,8 @@ static int qc_parse_pkt_frms(struct quic_conn *qc, struct quic_rx_packet *pkt,
11071107

11081108
case QUIC_RX_RET_FRM_AGAIN:
11091109
TRACE_STATE("AGAIN encountered", QUIC_EV_CONN_PRSHPKT, qc);
1110-
/* avoid freeing without eb_delete() */
1111-
frm = NULL;
1112-
goto err;
1110+
cf_err = 1;
1111+
break;
11131112

11141113
case QUIC_RX_RET_FRM_DONE:
11151114
TRACE_PROTO("frame handled", QUIC_EV_CONN_PRSAFRM, qc, frm);
@@ -1127,6 +1126,9 @@ static int qc_parse_pkt_frms(struct quic_conn *qc, struct quic_rx_packet *pkt,
11271126
qc_frm_free(qc, &frm);
11281127
}
11291128

1129+
if (cf_err)
1130+
goto err;
1131+
11301132
/* Error should be returned if some frames cannot be parsed. */
11311133
BUG_ON(!eb_is_empty(&cf_frms_tree));
11321134

0 commit comments

Comments
 (0)