Skip to content

usertrap: disable syscall patching when ptraced #12325

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

usertrap: disable syscall patching when ptraced #12325

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions pkg/sentry/platform/systrap/usertrap/usertrap_amd64.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,18 @@ func (s *State) PatchSyscall(ctx context.Context, ac *arch.Context64, mm memoryM
return fmt.Errorf("no task found")
}

// Skip syscall patching when the task is being ptraced, because
// single-stepping and other debugger features are incompatible with
// the "syshandler" routine used to handle patched syscalls (see
// syshandler_amd64.S). This incompatibility can result in inconsistent
// process states and failures (e.g. SIGSEGV).
// TODO: for a full fix we'd need to roll back existing patched
// syscalls, in case the traced program was patched before being
// traced (e.g. PTRACE_ATTACH on an already running process).
if task.Tracer() != nil {
return nil
}

s.mu.Lock()
defer s.mu.Unlock()

Expand Down