netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

systrap: Unset fpstate_changed if ctx did not change.

Browse Source 
For some reason we only cleared this flag in the sighandler, where it doesn't
make a difference.

PiperOrigin-RevId: 707690365
This commit is contained in:
Konstantin Bogomolov
2024-12-18 15:45:14 -08:00
committed by gVisor bot
parent a3e5887415
commit f7875f90fd
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sentry/platform/systrap/sysmsg/sighandler_amd64.c
+3 -2
View File
@@ -165,6 +165,7 @@ static void set_fsbase(uint64_t fsbase) {
struct thread_context *switch_context_amd64(
struct sysmsg *sysmsg, struct thread_context *ctx,
enum context_state new_context_state) {
// NOTE: Both ctx and old_ctx may not be valid and should not be dereferenced.
struct thread_context *old_ctx = sysmsg->context;
for (;;) {
@@ -238,8 +239,6 @@ void __export_sighandler(int signo, siginfo_t *siginfo, void *_ucontext) {
gregs_to_ptregs(ucontext, &ctx->ptregs);
memcpy(ctx->fpstate, (uint8_t *)ucontext->uc_mcontext.fpregs,
__export_arch_state.fp_len);
atomic_store(&ctx->fpstate_changed, 0);
}
enum context_state ctx_state = CONTEXT_STATE_INVALID;
@@ -329,6 +328,7 @@ void __export_sighandler(int signo, siginfo_t *siginfo, void *_ucontext) {
return;
}
atomic_store(&ctx->fpstate_changed, 0);
ctx = switch_context_amd64(sysmsg, ctx, ctx_state);
if (fs_base != ctx->ptregs.fs_base) {
set_fsbase(ctx->ptregs.fs_base);
@@ -362,6 +362,7 @@ void __syshandler() {
long fs_base = get_fsbase();
ctx->ptregs.fs_base = fs_base;
atomic_store(&ctx->fpstate_changed, 0);
ctx = switch_context_amd64(sysmsg, ctx, ctx_state);
// switch_context_amd64 changed sysmsg->state to THREAD_STATE_NONE, so we can
// only resume the current process, all other actions are