Zero out memory from PacketNumber in QuicBindingPreprocessPacket (#4560) (#4563)

nibanks · web-flow · commit 4c61684a1b7b · 2024-09-26T08:14:14.000-04:00
diff --git a/src/core/binding.c b/src/core/binding.c
@@ -1134,7 +1134,9 @@ QuicBindingPreprocessPacket(
     _Out_ BOOLEAN* ReleaseDatagram
     )
 {
-    CxPlatZeroMemory(&Packet->PacketNumber, sizeof(QUIC_RX_PACKET) - sizeof(uint64_t));
+    CxPlatZeroMemory(   // Zero out everything from PacketNumber forward
+        &Packet->PacketNumber,
+        sizeof(QUIC_RX_PACKET) - offsetof(QUIC_RX_PACKET, PacketNumber));
     Packet->AvailBuffer = Packet->Buffer;
     Packet->AvailBufferLength = Packet->BufferLength;
 

Original file line number	Diff line number	Diff line change
`@@ -1134,7 +1134,9 @@ QuicBindingPreprocessPacket(`
`1134`	`1134`	`_Out_ BOOLEAN* ReleaseDatagram`
`1135`	`1135`	`)`
`1136`	`1136`	`{`
`1137`		`- CxPlatZeroMemory(&Packet->PacketNumber, sizeof(QUIC_RX_PACKET) - sizeof(uint64_t));`
	`1137`	`+ CxPlatZeroMemory( // Zero out everything from PacketNumber forward`
	`1138`	`+ &Packet->PacketNumber,`
	`1139`	`+ sizeof(QUIC_RX_PACKET) - offsetof(QUIC_RX_PACKET, PacketNumber));`
`1138`	`1140`	`Packet->AvailBuffer = Packet->Buffer;`
`1139`	`1141`	`Packet->AvailBufferLength = Packet->BufferLength;`
`1140`	`1142`