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

Fix log message.

Browse Source 
PiperOrigin-RevId: 415354997
This commit is contained in:
Adin Scannell
2021-12-09 14:22:05 -08:00
committed by gVisor bot
parent f7a522a16b
commit 46d3404d8e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sentry/kernel/task_run.go
+2 -2
View File
@@ -199,10 +199,10 @@ func (app *runApp) execute(t *Task) taskRunState {
if t.haveSyscallReturn {
if sre, ok := linuxerr.SyscallRestartErrorFromReturn(t.Arch().Return()); ok {
if sre == linuxerr.ERESTART_RESTARTBLOCK {
t.Debugf("Restarting syscall %d with restart block after errno %d: not interrupted by handled signal", t.Arch().SyscallNo(), sre)
t.Debugf("Restarting syscall %d with restart block: not interrupted by handled signal", t.Arch().SyscallNo())
t.Arch().RestartSyscallWithRestartBlock()
} else {
t.Debugf("Restarting syscall %d after errno %d: not interrupted by handled signal", t.Arch().SyscallNo(), sre)
t.Debugf("Restarting syscall %d: not interrupted by handled signal", t.Arch().SyscallNo())
t.Arch().RestartSyscall()
}
}
pkg/sentry/kernel/task_signals.go
+1 -1
View File
@@ -177,7 +177,7 @@ func (t *Task) deliverSignal(info *linux.SignalInfo, act linux.SigAction) taskRu
t.Debugf("Not restarting syscall %d after errno %d: interrupted by signal %d", t.Arch().SyscallNo(), sre, info.Signo)
t.Arch().SetReturn(uintptr(-ExtractErrno(linuxerr.EINTR, -1)))
default:
t.Debugf("Restarting syscall %d after errno %d: interrupted by signal %d", t.Arch().SyscallNo(), sre, info.Signo)
t.Debugf("Restarting syscall %d: interrupted by signal %d", t.Arch().SyscallNo(), info.Signo)
t.Arch().RestartSyscall()
}
}