From 46d3404d8eed09f9f8f24807c3cabda38c0c712a Mon Sep 17 00:00:00 2001 From: Adin Scannell Date: Thu, 9 Dec 2021 14:19:44 -0800 Subject: [PATCH] Fix log message. PiperOrigin-RevId: 415354997 --- pkg/sentry/kernel/task_run.go | 4 ++-- pkg/sentry/kernel/task_signals.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/sentry/kernel/task_run.go b/pkg/sentry/kernel/task_run.go index be5d96ff4..64789cd7d 100644 --- a/pkg/sentry/kernel/task_run.go +++ b/pkg/sentry/kernel/task_run.go @@ -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() } } diff --git a/pkg/sentry/kernel/task_signals.go b/pkg/sentry/kernel/task_signals.go index e46c9c924..3e8c0c89b 100644 --- a/pkg/sentry/kernel/task_signals.go +++ b/pkg/sentry/kernel/task_signals.go @@ -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() } }