Skip to content

Avoid publishing interpreter frame with invalid IP #129795

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
BrzVlad merged 3 commits into from
Jun 26, 2026
+22 −0
Merged

Avoid publishing interpreter frame with invalid IP #129795

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fc8993
Test stackoverflow fix
BrzVlad Jun 24, 2026
ec79203
Use std::atomic_signal_fence instead
BrzVlad Jun 25, 2026
c7f83e5
Local scope for CompilerBarrier to interpexec.cpp
BrzVlad Jun 25, 2026
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
22 changes: 22 additions & 0 deletions src/coreclr/vm/interpexec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ extern "C" void SamplingProfiler_OnSamplepoint();
// for numeric_limits
#include <limits>
#include <functional>
#include <atomic>

// Compiler reordering barrier. Prevents the compiler from moving memory accesses across this
// point. It emits no instructions and provides no CPU or cross-thread ordering; use it only to
// order accesses with respect to asynchronous interruption on the SAME thread, such as a stack
// overflow or other hardware-exception handler.
Comment thread
BrzVlad marked this conversation as resolved.
static inline void CompilerBarrier()
{
std::atomic_signal_fence(std::memory_order_acq_rel);
}

struct InterpDispatchCacheEntry
{
Expand Down Expand Up @@ -3360,7 +3370,11 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
if (!pChildFrame)
{
pChildFrame = (InterpMethodContextFrame*)alloca(sizeof(InterpMethodContextFrame));
// We make sure that a new frame can't be seen with invalid ip/next when a stack
// overflow is triggered at a location outside of our control.
pChildFrame->ip = NULL;
pChildFrame->pNext = NULL;
CompilerBarrier();
pFrame->pNext = pChildFrame;
}
pChildFrame->ReInit(pFrame, targetIp, returnValueAddress, LOCAL_VAR_ADDR(callArgsOffset, int8_t));
Expand Down Expand Up @@ -3463,7 +3477,11 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
if (!pChildFrame)
{
pChildFrame = (InterpMethodContextFrame*)alloca(sizeof(InterpMethodContextFrame));
// We make sure that a new frame can't be seen with invalid ip/next when a stack
// overflow is triggered at a location outside of our control.
pChildFrame->ip = NULL;
pChildFrame->pNext = NULL;
CompilerBarrier();
pFrame->pNext = pChildFrame;
}
pChildFrame->ReInit(pFrame, targetIp, returnValueAddress, callArgsAddress);
Expand Down Expand Up @@ -4296,7 +4314,11 @@ do \
if (!pChildFrame)
{
pChildFrame = (InterpMethodContextFrame*)alloca(sizeof(InterpMethodContextFrame));
// We make sure that a new frame can't be seen with invalid ip/next when a stack
// overflow is triggered at a location outside of our control.
pChildFrame->ip = NULL;
pChildFrame->pNext = NULL;
CompilerBarrier();
pFrame->pNext = pChildFrame;
}
// Set the frame to the same values as the caller frame.
Expand Down
Loading