From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Fri, 5 Aug 2022 07:34:44 +0000 (+0200)
Subject: BUG/MINOR: quic: Missing Initial packet dropping case
X-Git-Tag: v2.7-dev3~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7df68a2198f0bf7aa3079b769f8e0fe38011306;p=thirdparty%2Fhaproxy.git

BUG/MINOR: quic: Missing Initial packet dropping case

An Initial packet shorter than 1200 bytes must be dropped. The test was there
without the "goto drop"!

Must be backported to 2.6
---

diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index c193c5f750..e754d9e925 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -5334,6 +5334,7 @@ static void qc_lstnr_pkt_rcv(unsigned char *buf, const unsigned char *end,
 		         dgram->len < QUIC_INITIAL_PACKET_MINLEN) {
 			TRACE_PROTO("Too short datagram with an Initial packet", QUIC_EV_CONN_LPKT, qc);
 			HA_ATOMIC_INC(&prx_counters->too_short_initial_dgram);
+			goto drop;
 		}
 
 		/* When multiple QUIC packets are coalesced on the same UDP datagram,