From 9699086043ae0ea01f14eca827837ad15bea8072 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 6 Jul 2020 14:23:26 -0700 Subject: [PATCH] runtime: mark OpenBSD raise function nosplit It is called by the signal handler before switching to gsignal (sigtrampgo -> sigfwdgo -> dieFromSignal -> raise) which means that it must not split the stack. All other instances of raise are already marked nosplit. Fixes #40076 Change-Id: I4794491331af48c46d0d8ebc82d34c6483f0e6cd Reviewed-on: https://go-review.googlesource.com/c/go/+/241121 Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot Reviewed-by: David Chase Reviewed-by: Cherry Zhang --- src/os/pipe_test.go | 19 +++++++++++++++++++ src/runtime/os_openbsd.go | 1 + 2 files changed, 20 insertions(+) diff --git a/src/os/pipe_test.go b/src/os/pipe_test.go index 2e93e3946a..429bd813c2 100644 --- a/src/os/pipe_test.go +++ b/src/os/pipe_test.go @@ -104,6 +104,25 @@ func TestStdPipe(t *testing.T) { } } } + + // Test redirecting stdout but not stderr. Issue 40076. + cmd := osexec.Command(os.Args[0], "-test.run", "TestStdPipeHelper") + cmd.Stdout = w + var stderr bytes.Buffer + cmd.Stderr = &stderr + cmd.Env = append(os.Environ(), "GO_TEST_STD_PIPE_HELPER=1") + if err := cmd.Run(); err == nil { + t.Errorf("unexpected success of write to closed stdout") + } else if ee, ok := err.(*osexec.ExitError); !ok { + t.Errorf("unexpected exec error type %T: %v", err, err) + } else if ws, ok := ee.Sys().(syscall.WaitStatus); !ok { + t.Errorf("unexpected wait status type %T: %v", ee.Sys(), ee.Sys()) + } else if !ws.Signaled() || ws.Signal() != syscall.SIGPIPE { + t.Errorf("unexpected exit status %v for write to closed stdout", err) + } + if output := stderr.Bytes(); len(output) > 0 { + t.Errorf("unexpected output on stderr: %s", output) + } } // This is a helper for TestStdPipe. It's not a test in itself. diff --git a/src/runtime/os_openbsd.go b/src/runtime/os_openbsd.go index b486b83688..cd3565df5b 100644 --- a/src/runtime/os_openbsd.go +++ b/src/runtime/os_openbsd.go @@ -340,6 +340,7 @@ func osStackRemap(s *mspan, flags int32) { } } +//go:nosplit func raise(sig uint32) { thrkill(getthrid(), int(sig)) } -- 2.48.1