Skip to content

Commit

Permalink
Re-order syscallbuf unmapping and stashed signal injection
Browse files Browse the repository at this point in the history
Fixes assertion in #3831. Using AutoRemoteSyscalls is not permitted
after the signal injection check, since it could cause additional
signals to be stashed.
  • Loading branch information
Keno authored and rocallahan committed Sep 21, 2024
1 parent 0da1fcb commit 2f319ca
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/RecordSession.cc
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,6 @@ void RecordSession::task_continue(const StepState& step_state) {
}
}
}
t->unmap_dead_syscallbufs_if_required();
t->resume_execution(resume, RESUME_NONBLOCKING, ticks_request);
}

Expand Down Expand Up @@ -2709,6 +2708,7 @@ RecordSession::RecordResult RecordSession::record_step() {
}

t->verify_signal_states();
t->unmap_dead_syscallbufs_if_required();

// We try to inject a signal if there's one pending; otherwise we continue
// task execution.
Expand Down

0 comments on commit 2f319ca

Please sign in to comment.