[DiagnosticServer] Impove ipc message parsing resiliency#122257
Merged
mdh1418 merged 4 commits intodotnet:mainfrom Dec 10, 2025
Merged
[DiagnosticServer] Impove ipc message parsing resiliency#122257mdh1418 merged 4 commits intodotnet:mainfrom
mdh1418 merged 4 commits intodotnet:mainfrom
Conversation
github-actions
bot
added
the
needs-area-label
Contributor
There was a problem hiding this comment.
Pull request overview
This PR improves the resiliency of IPC message parsing in the Diagnostic Server by addressing issues with truncated payloads. The changes add defensive checks to prevent buffer underruns and ensure proper data alignment when parsing UTF-16 strings.
Key Changes:
- Added alignment validation for UTF-16 string parsing to ensure buffer pointers are properly aligned
- Replaced an ineffective underflow assertion with both a clearer assertion and runtime validation in
ds_ipc_message_try_parse_value - Fixed comparison logic in
attach_profiler_command_try_parse_payloadto correctly validate sufficient buffer space
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/native/eventpipe/ds-protocol.c | Adds buffer alignment check for UTF-16 parsing and improves buffer length validation with runtime check |
| src/native/eventpipe/ds-profiler-protocol.c | Corrects buffer size validation from <= to >= to ensure adequate remaining buffer |
mdh1418
force-pushed
the
impove_ipc_message_parsing_resiliency
branch
from
e54397b to
93ea92f
Compare
This reverts commit 93ea92f.
lateralusX
reviewed
Dec 9, 2025
lateralusX
approved these changes
Dec 10, 2025
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
While investigating for a way to check whether arbitrary .NET processes support emitting userevents, the idea of probing for
DS_IPC_E_UNKNOWN_COMMAND 0x80131385with an empty payload uncovered a problem with truncated payloads. Additionally, there were two other places to improve the resiliency of IPC protocol parsing.