Skip to content

[CP] Fix leak on ACK encryption-level mismatch in loss detection (#6232) #6269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gaurav Singh (gaurav2699) merged 1 commit into from
Aug 26, 2026
Merged

[CP] Fix leak on ACK encryption-level mismatch in loss detection (#6232) #6269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 28 additions & 19 deletions src/core/loss_detection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1281,18 +1281,18 @@ QuicLossDetectionOnZeroRttRejected(
}

_IRQL_requires_max_(PASSIVE_LEVEL)
void
BOOLEAN
QuicLossDetectionProcessAckBlocks(
_In_ QUIC_LOSS_DETECTION* LossDetection,
_In_ QUIC_PATH* Path,
_In_ QUIC_RX_PACKET* Packet,
_In_ QUIC_ENCRYPT_LEVEL EncryptLevel,
_In_ uint64_t AckDelay,
_In_ QUIC_RANGE* AckBlocks,
_Out_ BOOLEAN* InvalidAckBlock,
_In_opt_ QUIC_ACK_ECN_EX* Ecn
)
{
BOOLEAN Result = TRUE;
QUIC_SENT_PACKET_METADATA* AckedPackets = NULL;
QUIC_SENT_PACKET_METADATA** AckedPacketsTail = &AckedPackets;

Expand All @@ -1305,8 +1305,6 @@ QuicLossDetectionProcessAckBlocks(
BOOLEAN NewLargestAckDifferentPath = FALSE;
uint64_t NewLargestAckTimestamp = 0;

*InvalidAckBlock = FALSE;

QUIC_SENT_PACKET_METADATA** LostPacketsStart = &LossDetection->LostPackets;
QUIC_SENT_PACKET_METADATA** SentPacketsStart = &LossDetection->SentPackets;
QUIC_SENT_PACKET_METADATA* LargestAckedPacket = NULL;
Expand All @@ -1327,8 +1325,8 @@ QuicLossDetectionProcessAckBlocks(
Connection->Send.SkippedPacketNumber,
AckBlock->Low,
QuicRangeGetHigh(AckBlock));
QuicConnTransportError(Connection, QUIC_ERROR_PROTOCOL_VIOLATION);
return;
Result = FALSE;
goto Exit;
}

//
Expand Down Expand Up @@ -1445,7 +1443,7 @@ QuicLossDetectionProcessAckBlocks(
//
// Nothing was acknowledged, so we can exit now.
//
return;
goto Exit;
}

uint64_t LargestAckedPacketNum = 0;
Expand All @@ -1467,8 +1465,8 @@ QuicLossDetectionProcessAckBlocks(
"[conn][%p] ERROR, %s.",
Connection,
"Incorrect ACK encryption level");
*InvalidAckBlock = TRUE;
return;
Result = FALSE;
goto Exit;
}

uint64_t PacketRtt = CxPlatTimeDiff64(PacketMeta->SentTime, TimeNow);
Expand Down Expand Up @@ -1626,18 +1624,28 @@ QuicLossDetectionProcessAckBlocks(

LossDetection->ProbeCount = 0;

Exit:

if (!Result) {
//
// A protocol violation was detected; fail the connection.
//
QuicConnTransportError(Connection, QUIC_ERROR_PROTOCOL_VIOLATION);
}

AckedPacketsIterator = AckedPackets;
while (AckedPacketsIterator != NULL) {
QUIC_SENT_PACKET_METADATA* PacketMeta = AckedPacketsIterator;
AckedPacketsIterator = AckedPacketsIterator->Next;
QuicSentPacketPoolReturnPacketMetadata(PacketMeta, Connection);
}

//
// At least one packet was ACKed. If all packets were ACKed then we'll
// cancel the timer; otherwise we'll reset the timer.
//
QuicLossDetectionUpdateTimer(LossDetection, FALSE);

return Result;
}

_IRQL_requires_max_(PASSIVE_LEVEL)
Expand Down Expand Up @@ -1693,15 +1701,16 @@ QuicLossDetectionProcessAckFrame(

AckDelay <<= Connection->PeerTransportParams.AckDelayExponent;

QuicLossDetectionProcessAckBlocks(
LossDetection,
Path,
Packet,
EncryptLevel,
AckDelay,
&Connection->DecodedAckRanges,
InvalidFrame,
FrameType == QUIC_FRAME_ACK_1 ? &Ecn : NULL);
if (!QuicLossDetectionProcessAckBlocks(
LossDetection,
Path,
Packet,
EncryptLevel,
AckDelay,
&Connection->DecodedAckRanges,
FrameType == QUIC_FRAME_ACK_1 ? &Ecn : NULL)) {
Result = FALSE;
}
}
}

Expand Down
Loading