diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-08-19 02:31:52 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-19 02:31:52 +0000 |
| commit | ffffdac11e14b1baadf19d357c1fbd20ce2931ee (patch) | |
| tree | 4a0eeb215ac66723474a0ce2a26a3c64eb65180d /pkg/sentry/kernel/task_run.go | |
| parent | 91407007c0df4813d06e22df1a43d2b0e413d938 (diff) | |
| parent | f2822da54293aaf1c161bde62dcfddfc234e4394 (diff) | |
Merge release-20200810.0-57-gf2822da54 (automated)
Diffstat (limited to 'pkg/sentry/kernel/task_run.go')
| -rw-r--r-- | pkg/sentry/kernel/task_run.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/sentry/kernel/task_run.go b/pkg/sentry/kernel/task_run.go index abaf29216..aa3a573c0 100644 --- a/pkg/sentry/kernel/task_run.go +++ b/pkg/sentry/kernel/task_run.go @@ -26,6 +26,7 @@ import ( ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" "gvisor.dev/gvisor/pkg/sentry/memmap" "gvisor.dev/gvisor/pkg/sentry/platform" + "gvisor.dev/gvisor/pkg/syserror" "gvisor.dev/gvisor/pkg/usermem" ) @@ -189,8 +190,8 @@ func (app *runApp) execute(t *Task) taskRunState { // a pending signal, causing another interruption, but that signal should // not interact with the interrupted syscall.) if t.haveSyscallReturn { - if sre, ok := SyscallRestartErrnoFromReturn(t.Arch().Return()); ok { - if sre == ERESTART_RESTARTBLOCK { + if sre, ok := syserror.SyscallRestartErrnoFromReturn(t.Arch().Return()); ok { + if sre == syserror.ERESTART_RESTARTBLOCK { t.Debugf("Restarting syscall %d with restart block after errno %d: not interrupted by handled signal", t.Arch().SyscallNo(), sre) t.Arch().RestartSyscallWithRestartBlock() } else { |