From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Wed, 15 Feb 2023 10:55:21 +0000 (+0100)
Subject: BUG/MINOR: quic: Wrong initialization for io_cb_wakeup boolean
X-Git-Tag: v2.8-dev5~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f7d22406cf35745708171dda8fa712d78a029ca;p=thirdparty%2Fhaproxy.git

BUG/MINOR: quic: Wrong initialization for io_cb_wakeup boolean

This bug arrives with this commit:
    982896961 MINOR: quic: split and rename qc_lstnr_pkt_rcv()
The first block of code consists in possibly setting this variable to true.
But it was already initialized to true before entering this code section.
Should be initialized to false.

Also take the opportunity to remove an unused "err" label.

Must be backported to 2.6 and 2.7.
---

diff --git a/src/quic_conn.c b/src/quic_conn.c
index 51242437cc..ebbf003cba 100644
--- a/src/quic_conn.c
+++ b/src/quic_conn.c
@@ -6589,7 +6589,7 @@ static void qc_rx_pkt_handle(struct quic_conn *qc, struct quic_rx_packet *pkt,
 	const struct quic_version *qv = pkt->version;
 	struct quic_enc_level *qel = NULL;
 	size_t b_cspace;
-	int io_cb_wakeup = 1;
+	int io_cb_wakeup = 0;
 
 	TRACE_ENTER(QUIC_EV_CONN_LPKT, qc, pkt, NULL, qv);
 
@@ -6657,7 +6657,6 @@ static void qc_rx_pkt_handle(struct quic_conn *qc, struct quic_rx_packet *pkt,
 
  drop:
 	HA_ATOMIC_INC(&qc->prx_counters->dropped_pkt);
- err:
 	if (io_cb_wakeup) {
 		TRACE_DEVEL("needs to wakeup the timer task after the amplification limit was reached",
 		            QUIC_EV_CONN_LPKT, qc);