From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Tue, 16 Aug 2022 12:48:59 +0000 (+0200)
Subject: BUG/MINOR: quic: Wrong status returned by qc_pkt_decrypt()
X-Git-Tag: v2.7-dev4~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11a6f4007b908b49ecd3abd5cd10fba177f07c11;p=thirdparty%2Fhaproxy.git

BUG/MINOR: quic: Wrong status returned by qc_pkt_decrypt()

This bug came with this big commit:
     "MEDIUM: quic: xprt traces rework"

This is the <ret> variable value which must be returned by most of the xprt functions.
This leaded packets which could not be decrypted to be parsed, with weird frames
to be parsed as found by Tristan in GH #1808.

To be backported where the commit above was backported.
---

diff --git a/src/xprt_quic.c b/src/xprt_quic.c
index 762a3725b7..bcd99ae702 100644
--- a/src/xprt_quic.c
+++ b/src/xprt_quic.c
@@ -1453,7 +1453,7 @@ static int qc_pkt_decrypt(struct quic_rx_packet *pkt, struct quic_enc_level *qel
 	ret = 1;
  leave:
 	TRACE_LEAVE(QUIC_EV_CONN_RXPKT, qc);
-	return 1;
+	return ret;
 }