From: Hugo Landau <hlandau@openssl.org>
Date: Thu, 17 Aug 2023 17:31:15 +0000 (+0100)
Subject: QUIC QRX: Initialise all RXE fields properly for non-encrypted packets
X-Git-Tag: openssl-3.2.0-alpha1~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=413a427c2a7743474f57d5799f42de5357ceace2;p=thirdparty%2Fopenssl.git

QUIC QRX: Initialise all RXE fields properly for non-encrypted packets

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21764)
---

diff --git a/ssl/quic/quic_record_rx.c b/ssl/quic/quic_record_rx.c
index bb94d3085e0..e4705a1cce8 100644
--- a/ssl/quic/quic_record_rx.c
+++ b/ssl/quic/quic_record_rx.c
@@ -873,6 +873,13 @@ static int qrx_process_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
         rxe->hdr.data   = rxe_data(rxe);
         rxe->pn         = QUIC_PN_INVALID;
 
+        rxe->data_len       = rxe->hdr.len;
+        rxe->datagram_len   = datagram_len;
+        rxe->key_epoch      = 0;
+        rxe->peer           = urxe->peer;
+        rxe->local          = urxe->local;
+        rxe->time           = urxe->time;
+
         /* Move RXE to pending. */
         ossl_list_rxe_remove(&qrx->rx_free, rxe);
         ossl_list_rxe_insert_tail(&qrx->rx_pending, rxe);