Skip to content

Fix for a deadlock discovered in 4169 #4245

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
merged 1 commit into from
Apr 16, 2024
Merged

Fix for a deadlock discovered in 4169 #4245

Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions src/core/packet_builder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ QuicPacketBuilderInitialize(
Builder->Path = Path;
Builder->PacketBatchSent = FALSE;
Builder->PacketBatchRetransmittable = FALSE;
Builder->WrittenConnectionCloseFrame = FALSE;
Builder->Metadata = &Builder->MetadataStorage.Metadata;
Builder->EncryptionOverhead = CXPLAT_ENCRYPTION_OVERHEAD;
Builder->TotalDatagramsLength = 0;
Expand Down Expand Up @@ -493,9 +494,12 @@ QuicPacketBuilderGetPacketTypeAndKeyForControlFrames(
? QUIC_PACKET_KEY_HANDSHAKE
: QUIC_PACKET_KEY_INITIAL;

if ((Builder->Datagram == NULL || Builder->DatagramLength == 0) &&
if (!Builder->WrittenConnectionCloseFrame &&
Connection->Crypto.TlsState.WriteKeys[PreviousKeyType] != NULL) {
MaxKeyType = PreviousKeyType; // Use the lower key for the first packet in a datagram.
//
// Downgrade the key so that we send the CLOSE frame on previous protection level.
//
MaxKeyType = PreviousKeyType;
}
}

Expand Down
5 changes: 5 additions & 0 deletions src/core/packet_builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ typedef struct QUIC_PACKET_BUILDER {
//
uint8_t EcnEctSet : 1;

//
// Indicates that a CONNECTION_CLOSE frame was written in some packet.
//
uint8_t WrittenConnectionCloseFrame : 1;

//
// The total number of datagrams that have been created.
//
Expand Down
4 changes: 3 additions & 1 deletion src/core/send.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ QuicSendWriteFrames(
char* CloseReasonPhrase = Connection->CloseReasonPhrase;

if (IsApplicationClose && ! Is1RttEncryptionLevel) {
//
//
// A CONNECTION_CLOSE of type 0x1d MUST be replaced by a CONNECTION_CLOSE of
// type 0x1c when sending the frame in Initial or Handshake packets. Otherwise,
// information about the application state might be revealed. Endpoints MUST
Expand All @@ -558,6 +558,8 @@ QuicSendWriteFrames(
AvailableBufferLength,
Builder->Datagram->Buffer)) {

Builder->WrittenConnectionCloseFrame = TRUE;

//
// We potentially send the close frame on multiple protection levels.
// We send in increasing encryption level so clear the flag only once
Expand Down