Skip to content

Commit d286e61

Browse files
committed
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. May fix #39079. Change-Id: I59b2c5dc08c3c951f1098fff038bf2e06d7ca055 Reviewed-on: https://go-review.googlesource.com/c/go/+/238020 Run-TryBot: Cherry Zhang <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]>
1 parent 41bdb93 commit d286e61

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/runtime/signal_unix.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,15 +432,15 @@ func sigtrampgo(sig uint32, info *siginfo, ctx unsafe.Pointer) {
432432
return
433433
}
434434

435+
setg(g.m.gsignal)
436+
435437
// If some non-Go code called sigaltstack, adjust.
436438
var gsignalStack gsignalStack
437439
setStack := adjustSignalStack(sig, g.m, &gsignalStack)
438440
if setStack {
439441
g.m.gsignal.stktopsp = getcallersp()
440442
}
441443

442-
setg(g.m.gsignal)
443-
444444
if g.stackguard0 == stackFork {
445445
signalDuringFork(sig)
446446
}

0 commit comments

Comments
 (0)