[release-branch.go1.14] runtime: set g to gsignal before adjustSignalStack

When a signal is received, the runtime probes whether an
alternate signal stack is set, if so, adjust gsignal's stack to
point to the alternate signal stack. This is done in
adjustSignalStack, which calls sigaltstack "syscall", which is a
libc call on darwin through asmcgocall. asmcgocall decides
whether to do stack switch based on whether we're running on g0
stack, gsignal stack, or regular g stack. If g is not set to
gsignal, asmcgocall may make wrong decision. Set g first.
adjustSignalStack is recursively nosplit, so it is okay that
temporarily gsignal.stack doesn't match the stack we're running
on.

Updates #39079.
Fixes #41991.

Change-Id: I59b2c5dc08c3c951f1098fff038bf2e06d7ca055
Reviewed-on: https://go-review.googlesource.com/c/go/+/238020
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
(cherry picked from commit d286e61b6787fe2b55bf0ec8a814962ebda8d202)
Reviewed-on: https://go-review.googlesource.com/c/go/+/262557
Trust: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Austin Clements <austin@google.com>

diff --git a/src/runtime/signal_unix.go b/src/runtime/signal_unix.go
index f18e6b5785d4e43f9a904e8d6a031e25670ffa70..dbac55c3d1d3398d55f483f96701622a546a9b9d 100644 (file)
--- a/src/runtime/signal_unix.go
+++ b/src/runtime/signal_unix.go
@@ -435,6 +435,8 @@ func sigtrampgo(sig uint32, info *siginfo, ctx unsafe.Pointer) {
                return
        }
 
+       setg(g.m.gsignal)
+
        // If some non-Go code called sigaltstack, adjust.
        var gsignalStack gsignalStack
        setStack := adjustSignalStack(sig, g.m, &gsignalStack)
@@ -442,8 +444,6 @@ func sigtrampgo(sig uint32, info *siginfo, ctx unsafe.Pointer) {
                g.m.gsignal.stktopsp = getcallersp()
        }
 
-       setg(g.m.gsignal)
-
        if g.stackguard0 == stackFork {
                signalDuringFork(sig)
        }