Skip to content

Avoid reporting incorrect thread context to Watson #117522

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 2 commits into from
Jul 15, 2025
Merged

Avoid reporting incorrect thread context to Watson #117522

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d34faf5
Avoid reporting incorrect thread context to Watson
tommcdon Jul 10, 2025
f6a7fc0
Update src/coreclr/vm/excep.cpp
jkotas Jul 13, 2025
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
10 changes: 8 additions & 2 deletions src/coreclr/vm/excep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3567,8 +3567,14 @@ LONG WatsonLastChance( // EXCEPTION_CONTINUE_SEARCH, _CONTINUE_
#ifdef HOST_WINDOWS
CreateCrashDumpIfEnabled(fSOException);
#endif
RaiseFailFastException(pExceptionInfo == NULL ? NULL : pExceptionInfo->ExceptionRecord,
pExceptionInfo == NULL ? NULL : pExceptionInfo->ContextRecord,
// RaiseFailFastException validates that the context matches a valid return address on the stack as part of CET.
// If the return address is not valid, it rejects the context, flags it as a potential attack and asserts in
// checked builds of Windows OS.
// Avoid reporting thread context captured by EEPolicy::HandleFatalError since it has IP that does not
// match a valid return address on the stack.
bool fAvoidReportContextToRaiseFailFast = tore.IsFatalError();
RaiseFailFastException(pExceptionInfo == NULL ? NULL : pExceptionInfo->ExceptionRecord,
pExceptionInfo == NULL || fAvoidReportContextToRaiseFailFast ? NULL : pExceptionInfo->ContextRecord,
0);
STRESS_LOG0(LF_CORDB, LL_INFO10, "D::RFFE: Return from RaiseFailFastException\n");
}
Expand Down