Skip to content

Prevent out-of-bounds header protection sample reads #6310

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

Open
SanthoshShetty (Santhosha-bk) wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −4
Open

Prevent out-of-bounds header protection sample reads #6310

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
16 changes: 12 additions & 4 deletions src/core/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4086,10 +4086,18 @@ QuicConnRecvHeader(
// don't actually know the length of the packet number so we assume maximum
// (per spec) and start sampling 4 bytes after the start of the packet number.
//
CxPlatCopyMemory(
Cipher,
Packet->AvailBuffer + Packet->HeaderLength + 4,
CXPLAT_HP_SAMPLE_LENGTH);
if (Packet->Encrypted && Connection->State.HeaderProtectionEnabled) {
CxPlatCopyMemory(
Cipher,
Packet->AvailBuffer + Packet->HeaderLength + 4,
CXPLAT_HP_SAMPLE_LENGTH);
} else {
//
// For unencrypted short header packets, no header protection mask will be computed,
// so avoid reading an HP sample that may extend beyond the packet.
//
CxPlatZeroMemory(Cipher, CXPLAT_HP_SAMPLE_LENGTH);

@anrossi Anthony Rossi (anrossi) Sep 8, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When do we expect to see unencrypted short header packets? When a connection negotiates the no-encryption custom transport parameter?

}

return TRUE;
}
Expand Down
Loading