From 7d22c2181b4343b58e40962cefd52af1284b4294 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 26 Apr 2021 17:27:58 -0700 Subject: syscall: restore signal mask after setting foreground process group Fixes #37217 Change-Id: I0151bb77fc4c4552d1b19c31d784943b72f84b80 Reviewed-on: https://go-review.googlesource.com/c/go/+/313653 Trust: Ian Lance Taylor Run-TryBot: Ian Lance Taylor TryBot-Result: Go Bot Reviewed-by: Tobias Klauser --- src/syscall/exec_libc.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/syscall/exec_libc.go') diff --git a/src/syscall/exec_libc.go b/src/syscall/exec_libc.go index 3c8e87d32f..8a84954051 100644 --- a/src/syscall/exec_libc.go +++ b/src/syscall/exec_libc.go @@ -116,8 +116,6 @@ func forkAndExecInChild(argv0 *byte, argv, envv []*byte, chroot, dir *byte, attr // Fork succeeded, now in child. - runtime_AfterForkInChild() - // Session ID if sys.Setsid { _, err1 = setsid() @@ -153,6 +151,10 @@ func forkAndExecInChild(argv0 *byte, argv, envv []*byte, chroot, dir *byte, attr } } + // Restore the signal mask. We do this after TIOCSPGRP to avoid + // having the kernel send a SIGTTOU signal to the process group. + runtime_AfterForkInChild() + // Chroot if chroot != nil { err1 = chroot1(uintptr(unsafe.Pointer(chroot))) -- cgit v1.3-5-g45d5