Constrain GetExport RuntimeInfo dereference to module bounds in dbgshim#5919
Open
tommcdon wants to merge 1 commit into
Open
Constrain GetExport RuntimeInfo dereference to module bounds in dbgshim#5919tommcdon wants to merge 1 commit into
tommcdon wants to merge 1 commit into
Conversation
GetTargetCLRMetrics dereferenced the DotNetRuntimeInfo export returned by PEDecoder::GetExport without verifying the whole RuntimeInfo struct lies within the module. Add a CheckRva over sizeof(RuntimeInfo) before reading it, matching the existing bounds checks on the engine-metrics path. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR hardens dbgshim’s Windows GetTargetCLRMetrics path by ensuring the DotNetRuntimeInfo export (resolved via PEDecoder::GetExport) is not dereferenced unless the full RuntimeInfo struct lies within the module’s bounds, aligning it with the existing export/metrics bounds-checking patterns already used elsewhere in the function.
Changes:
- Add a
PEDecoder::CheckRva(..., sizeof(RuntimeInfo))guard before casting/dereferencing theRuntimeInfo*returned from the export lookup.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
hoyosjs
approved these changes
Jul 8, 2026
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.
GetTargetCLRMetrics dereferenced the DotNetRuntimeInfo export returned by PEDecoder::GetExport without verifying the whole RuntimeInfo struct lies within the module. Add a CheckRva over sizeof(RuntimeInfo) before reading it, matching the existing bounds checks on the engine-metrics path.