fix(rdpdr): consume query information body - #1810
Merged
Marc-André Moreau (mamoreau-devolutions) merged 1 commit intoAug 27, 2026
Merged
Conversation
DR_DRIVE_QUERY_INFORMATION_REQ previously decoded only the FsInformationClass field and ignored Length, Padding, and QueryBuffer, leaving those bytes unconsumed on the wire cursor. Servers that send a non-empty QueryBuffer (per MS-RDPEFS 2.2.3.3.8) desynchronized subsequent PDU parsing. Decode and encode the full fixed part (FsInformationClass, Length, 24-byte Padding) and advance the cursor past the Length-bounded QueryBuffer on decode. Encode continues to emit an empty QueryBuffer since this representation only retains the information class.
Marc-André Moreau (mamoreau-devolutions)
deployed
to
llm-providers
August 27, 2026 14:52 — with
GitHub Actions
Active
Copilot started reviewing on behalf of
Marc-André Moreau (mamoreau-devolutions)
August 27, 2026 14:52
View session
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes RDPDR query-information parsing to consume the complete protocol body and prevent subsequent PDU desynchronization.
Changes:
- Decodes and validates
Length, padding, andQueryBuffer. - Encodes the complete fixed request body.
- Adds round-trip, buffer-consumption, and truncation tests.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
crates/ironrdp-rdpdr/src/pdu/efs.rs |
Implements complete request-body handling. |
crates/ironrdp-testsuite-core/tests/rdpdr/mod.rs |
Tests wire encoding and malformed input. |
Marc-André Moreau (mamoreau-devolutions)
merged commit Aug 27, 2026
476e8a1
into
master
44 checks passed
Marc-André Moreau (mamoreau-devolutions)
deleted the
copilot/rdpdr-query-fix
branch
August 27, 2026 15:24
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
DR_DRIVE_QUERY_INFORMATION_REQ previously decoded only the
FsInformationClass field and ignored Length, Padding, and QueryBuffer,
leaving those bytes unconsumed on the wire cursor. Servers that send a
non-empty QueryBuffer (per MS-RDPEFS 2.2.3.3.8) desynchronized
subsequent PDU parsing.
Decode and encode the full fixed part (FsInformationClass, Length,
24-byte Padding) and advance the cursor past the Length-bounded
QueryBuffer on decode. Encode continues to emit an empty QueryBuffer
since this representation only retains the information class.