Skip to content

Commit 058b9dd

Browse files
committed
BUG/MINOR: quic: fix malformed probing packet building
This bug arrived with this commit: cdfceb1 MINOR: quic: refactor qc_prep_pkts() loop which prevents haproxy from sending PING only packets/datagrams (some packets/datagrams with only PING frame as ack-eliciting frames inside). Such packets/datagrams are useful in rare cases during retransmissions when one wants to probe the peer without exceeding the anti-amplification limit. Modify the condition passed to qc_build_pkt() to add padding to the current datagram. One does not want to do that when probing the peer without ack-eliciting frames passed as <frms> parameter. Indeed qc_build_pkt() calls qc_do_build_pkt() which supports this case: if <probe> is true (probing required), qc_do_build_pkt() handles the case where some padding must be added to a PING only packet/datagram. This is the case when probing with an empty <frms> frame list of ack-eliciting frames without exceeding the anti-amplification limit from qc_dgrams_retransmit(). Add some comments to qc_build_pkt() and qc_do_build_pkt() to clarify this as this code is easy to break! Thank you for @Tristan971 for having reported this issue in GH #2709. Must be backported to 3.0.
1 parent fc59063 commit 058b9dd

File tree

1 file changed

+27
-3
lines changed

1 file changed

+27
-3
lines changed

src/quic_tx.c

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -623,14 +623,24 @@ static int qc_prep_pkts(struct quic_conn *qc, struct buffer *buf,
623623
break;
624624
}
625625

626-
/* padding will be set for last QEL */
626+
/* padding will be set for last QEL, except when probing:
627+
* to build a PING only non coalesced Initial datagram for
628+
* instance when blocked by the anti-amplification limit,
629+
* this datagram MUST be padded.
630+
*/
627631
padding = 1;
628632
}
629633

630634
pkt_type = quic_enc_level_pkt_type(qc, qel);
635+
/* <paddding> parameter for qc_build_pkt() must not be set to 1 when
636+
* building PING only Initial datagram (a datagram with an Initial
637+
* packet inside containing only a PING frame as ack-eliciting
638+
* frame). This is the case when both <probe> and LIST_EMPTY(<frms>)
639+
* conditions are verified (see qc_do_build_pkt()).
640+
*/
631641
cur_pkt = qc_build_pkt(&pos, end, qel, tls_ctx, frms,
632-
qc, ver, dglen, pkt_type,
633-
must_ack, padding && !next_qel,
642+
qc, ver, dglen, pkt_type, must_ack,
643+
padding && !next_qel && (!probe || !LIST_ISEMPTY(frms)),
634644
probe, cc, &err);
635645
if (!cur_pkt) {
636646
switch (err) {
@@ -1812,6 +1822,20 @@ static inline uint64_t quic_compute_ack_delay_us(unsigned int time_received,
18121822
* number field in this packet. <pn_len> will also have the packet number
18131823
* length as value.
18141824
*
1825+
* NOTE: This function does not build all the possible combinations of packets
1826+
* depending on its list of parameters. In most cases, <frms> frame list is
1827+
* not empty. So, this function first tries to build this list of frames.
1828+
* Then some padding is added to this packet if <padding> boolean is set true.
1829+
* The unique case one wants to do that is when a first Initial packet was
1830+
* previously built into the same datagram as the currently built one and when
1831+
* this packet is supposed to pad the datagram, if needed, to build an at
1832+
* least 1200 bytes long Initial datagram.
1833+
* If <padding> is not true, if the packet is too short, the packet is also
1834+
* padded. This is very often the case when no frames are provided by <frms>
1835+
* and when probing with only a PING frame.
1836+
* Finally, if <frms> was empty, if <probe> boolean is true this function builds
1837+
* a PING only packet handling also the cases where it must be padded.
1838+
*
18151839
* Return 1 if succeeded (enough room to buile this packet), O if not.
18161840
*/
18171841
static int qc_do_build_pkt(unsigned char *pos, const unsigned char *end,

0 commit comments

Comments
 (0)