diff options
| author | Brian Geffon <bgeffon@google.com> | 2018-12-26 11:24:29 -0800 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-12-26 11:26:28 -0800 |
| commit | bfa2f314ca05854b0d08aa2f5c2b93b16542d95f (patch) | |
| tree | 41a42ad8a321171560513cea79faa2db946a48a9 /pkg/sentry/kernel/task_signals.go | |
| parent | 0df0df35fc4aa4d69dc01f7c7e2d9e0530a34db7 (diff) | |
Add EventChannel messages for uncaught signals.
PiperOrigin-RevId: 226936778
Change-Id: I2a6dda157c55d39d81e1b543ab11a58a0bfe5c05
Diffstat (limited to 'pkg/sentry/kernel/task_signals.go')
| -rw-r--r-- | pkg/sentry/kernel/task_signals.go | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/pkg/sentry/kernel/task_signals.go b/pkg/sentry/kernel/task_signals.go index fe24f7542..583acddb1 100644 --- a/pkg/sentry/kernel/task_signals.go +++ b/pkg/sentry/kernel/task_signals.go @@ -22,8 +22,10 @@ import ( "time" "gvisor.googlesource.com/gvisor/pkg/abi/linux" + "gvisor.googlesource.com/gvisor/pkg/eventchannel" "gvisor.googlesource.com/gvisor/pkg/sentry/arch" "gvisor.googlesource.com/gvisor/pkg/sentry/kernel/auth" + ucspb "gvisor.googlesource.com/gvisor/pkg/sentry/kernel/uncaught_signal_go_proto" "gvisor.googlesource.com/gvisor/pkg/sentry/usermem" "gvisor.googlesource.com/gvisor/pkg/syserror" ) @@ -184,6 +186,23 @@ func (t *Task) deliverSignal(info *arch.SignalInfo, act arch.SignalAct) taskRunS case SignalActionTerm, SignalActionCore: // "Default action is to terminate the process." - signal(7) t.Debugf("Signal %d: terminating thread group", info.Signo) + + // Emit an event channel messages related to this uncaught signal. + ucs := &ucspb.UncaughtSignal{ + Tid: int32(t.Kernel().TaskSet().Root.IDOfTask(t)), + Pid: int32(t.Kernel().TaskSet().Root.IDOfThreadGroup(t.ThreadGroup())), + Registers: t.Arch().StateData().Proto(), + SignalNumber: info.Signo, + } + + // Attach an fault address if appropriate. + switch linux.Signal(info.Signo) { + case linux.SIGSEGV, linux.SIGFPE, linux.SIGILL, linux.SIGTRAP, linux.SIGBUS: + ucs.FaultAddr = info.Addr() + } + + eventchannel.Emit(ucs) + t.PrepareGroupExit(ExitStatus{Signo: int(info.Signo)}) return (*runExit)(nil) |