diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-30 01:11:13 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-30 01:11:13 +0000 |
| commit | 09cba788b0e19d207dc447372d9cc63eb192d09c (patch) | |
| tree | 21991c1a80571cf5c1de7c0dc4a29041dc3c9788 /pkg/sentry/kernel/task_signals.go | |
| parent | eac775f807932304413ea34856babd8bc503a54b (diff) | |
| parent | 387501219e87701a6adeb8417542927ee39b9950 (diff) | |
Merge release-20200921.0-74-g387501219 (automated)
Diffstat (limited to 'pkg/sentry/kernel/task_signals.go')
| -rw-r--r-- | pkg/sentry/kernel/task_signals.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/task_signals.go b/pkg/sentry/kernel/task_signals.go index feaa38596..ebdb83061 100644 --- a/pkg/sentry/kernel/task_signals.go +++ b/pkg/sentry/kernel/task_signals.go @@ -259,7 +259,11 @@ func (t *Task) deliverSignalToHandler(info *arch.SignalInfo, act arch.SignalAct) // Set up the signal handler. If we have a saved signal mask, the signal // handler should run with the current mask, but sigreturn should restore // the saved one. - st := &arch.Stack{t.Arch(), mm, sp} + st := &arch.Stack{ + Arch: t.Arch(), + IO: mm, + Bottom: sp, + } mask := t.signalMask if t.haveSavedSignalMask { mask = t.savedSignalMask |