netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7943 from nelhage:issue7941

Browse Source 
PiperOrigin-RevId: 472479786
This commit is contained in:
gVisor bot
2022-09-06 09:34:27 -07:00
parent dade50095a a3a5772491
commit 2828b3f364
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sentry/kernel/thread_group.go
+2 -1
View File
@@ -514,9 +514,10 @@ func (tg *ThreadGroup) SetForegroundProcessGroup(tty *TTY, pgid ProcessGroupID)
// signal is sent to all members of this background process group.
// We need also need to check whether it is ignoring or blocking SIGTTOU.
ignored := signalAction.Handler == linux.SIG_IGN
blocked := linux.SignalSet(tg.leader.signalMask.RacyLoad()) == linux.SignalSetOf(linux.SIGTTOU)
blocked := (linux.SignalSet(tg.leader.signalMask.RacyLoad()) & linux.SignalSetOf(linux.SIGTTOU)) != 0
if tg.processGroup.id != tg.processGroup.session.foreground.id && !ignored && !blocked {
tg.leader.sendSignalLocked(SignalInfoPriv(linux.SIGTTOU), true)
return -1, linuxerr.ERESTARTSYS
}
tg.processGroup.session.foreground.id = pgid
test/syscalls/linux/pty.cc
+13
View File
@@ -1656,6 +1656,10 @@ TEST_F(JobControlTest, SetForegroundProcessGroupSIGTTOUBackground) {
int wstatus;
TEST_PCHECK(waitpid(grandchild, &wstatus, WSTOPPED) == grandchild);
TEST_PCHECK(WSTOPSIG(wstatus) == SIGTTOU);
// The child's `tcsetpgrp` got signalled and so should not have
// taken effect. Verify that.
TEST_PCHECK(tcgetpgrp(replica_.get()) == getpid());
EXPECT_THAT(kill(grandchild, SIGKILL), SyscallSucceeds());
});
ASSERT_NO_ERRNO(res);
@@ -1703,11 +1707,20 @@ TEST_F(JobControlTest, SetForegroundProcessGroupSIGTTOUBlocked) {
sigset_t signal_set;
sigemptyset(&signal_set);
sigaddset(&signal_set, SIGTTOU);
// Block SIGTTIN as well, to make sure that the kernel isn't
// checking for "blocked == [SIGTTOU]" (see issue 7941 for
// context).
sigaddset(&signal_set, SIGTTIN);
sigprocmask(SIG_BLOCK, &signal_set, NULL);
// Assign a different pgid to the child so it will result as
// a background process.
TEST_PCHECK(!setpgid(grandchild, getpid()));
TEST_PCHECK(!tcsetpgrp(replica_.get(), getpgid(0)));
// Unmask the signals to make sure we still don't get
// signaled. That would happen if `tcsetpgrp` enqueued the
// signal through the mask -- we would not yet have received it,
// because of the mask.
sigprocmask(SIG_UNBLOCK, &signal_set, NULL);
_exit(0);
}
int wstatus;