From 4bcbb55fcba52ed2349e847a610b6afb3cc69011 Mon Sep 17 00:00:00 2001 From: Konstantin Bogomolov Date: Mon, 16 Sep 2024 17:07:40 -0700 Subject: [PATCH] kvm: Fix sigsys handler error message. And remove bluepillSignal var for amd64; it's unused. PiperOrigin-RevId: 675344862 --- pkg/sentry/platform/kvm/bluepill_amd64.go | 6 ------ pkg/sentry/platform/kvm/machine.go | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkg/sentry/platform/kvm/bluepill_amd64.go b/pkg/sentry/platform/kvm/bluepill_amd64.go index 66e986452..268154f1f 100644 --- a/pkg/sentry/platform/kvm/bluepill_amd64.go +++ b/pkg/sentry/platform/kvm/bluepill_amd64.go @@ -18,16 +18,10 @@ package kvm import ( - "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/ring0" "gvisor.dev/gvisor/pkg/sentry/arch" ) -var ( - // The action for bluepillSignal is changed by sigaction(). - bluepillSignal = unix.SIGSEGV -) - func bluepillArchVCPU(context *arch.SignalContext64) *vCPU { return vCPUPtr(uintptr(context.Rax)) } diff --git a/pkg/sentry/platform/kvm/machine.go b/pkg/sentry/platform/kvm/machine.go index 2d656588b..1aa537fe3 100644 --- a/pkg/sentry/platform/kvm/machine.go +++ b/pkg/sentry/platform/kvm/machine.go @@ -828,7 +828,7 @@ func seccompMmapRules(m *machine) { seccompMmapRulesOnce.Do(func() { // Install the handler. if err := sighandling.ReplaceSignalHandler(unix.SIGSYS, addrOfSigsysHandler(), &savedSigsysHandler); err != nil { - panic(fmt.Sprintf("Unable to set handler for signal %d: %v", bluepillSignal, err)) + panic(fmt.Sprintf("Unable to set handler for signal %d: %v", unix.SIGSYS, err)) } rules := []seccomp.RuleSet{ // Trap mmap system calls and handle them in sigsysGoHandler