From 7c5ab794f140dda031ba015d79892a79dd523d50 Mon Sep 17 00:00:00 2001 From: gystemd Date: Mon, 16 Aug 2021 16:33:57 +0200 Subject: fix sending of SIGTTOU signal in SetForegroundProcessGroup Changed sendSignal to sendSignalLocked because tg.pidns.owner.mu and tg.signalHandlers.mu are already locked in SetForegroundProcess Added a control to verify whether the calling process is ignoring SIGTTOU before sending the signal --- pkg/sentry/kernel/thread_group.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkg/sentry') diff --git a/pkg/sentry/kernel/thread_group.go b/pkg/sentry/kernel/thread_group.go index 6d865b814..c16b9eb37 100644 --- a/pkg/sentry/kernel/thread_group.go +++ b/pkg/sentry/kernel/thread_group.go @@ -511,9 +511,11 @@ func (tg *ThreadGroup) SetForegroundProcessGroup(tty *TTY, pgid ProcessGroupID) return -1, linuxerr.EPERM } - //if the calling process is a member of a background group, a SIGTTOU signal is sent to all members of this background process group. - if tg.processGroup.session.foreground.id != tg.processGroup.id { - tg.processGroup.SendSignal(&linux.SignalInfo{Signo: int32(linux.SIGTTOU)}) + sa:= tg.signalHandlers.actions[linux.SIGTTOU] + //if the calling process is a member of a background group, a SIGTTOU + //signal is sent to all members of this background process group. + if tg.processGroup.id != tg.processGroup.session.foreground.id && sa.Handler!=linux.SIG_IGN{ + tg.leader.sendSignalLocked(SignalInfoPriv(linux.SIGTTOU),true) } tg.processGroup.session.foreground.id = pgid -- cgit v1.2.3