Skip to content

Commit 49b017f

Browse files
GeorgeTsiliasianlancetaylor
authored andcommitted
runtime: handle signal 34 for musl setgid
It has been observed that setgid hangs when using cgo with musl. This fix ensures that signal 34 gets handled in an appropriate way, like signal 33 when using glibc. Fixes #39343 Change-Id: I89565663e2c361f62cbccfe80aaedf290bd58d57 Reviewed-on: https://go-review.googlesource.com/c/go/+/236518 Run-TryBot: Tobias Klauser <[email protected]> TryBot-Result: Go Bot <[email protected]> Trust: Tobias Klauser <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]>
1 parent 40d1ec5 commit 49b017f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/runtime/sigtab_linux_generic.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ var sigtable = [...]sigTabT{
4545
/* 31 */ {_SigThrow, "SIGSYS: bad system call"},
4646
/* 32 */ {_SigSetStack + _SigUnblock, "signal 32"}, /* SIGCANCEL; see issue 6997 */
4747
/* 33 */ {_SigSetStack + _SigUnblock, "signal 33"}, /* SIGSETXID; see issues 3871, 9400, 12498 */
48-
/* 34 */ {_SigNotify, "signal 34"},
48+
/* 34 */ {_SigSetStack + _SigUnblock, "signal 34"}, /* musl SIGSYNCCALL; see issue 39343 */
4949
/* 35 */ {_SigNotify, "signal 35"},
5050
/* 36 */ {_SigNotify, "signal 36"},
5151
/* 37 */ {_SigNotify, "signal 37"},

src/runtime/sigtab_linux_mipsx.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var sigtable = [...]sigTabT{
4242
/* 31 */ {_SigNotify, "SIGXFSZ: file size limit exceeded"},
4343
/* 32 */ {_SigSetStack + _SigUnblock, "signal 32"}, /* SIGCANCEL; see issue 6997 */
4444
/* 33 */ {_SigSetStack + _SigUnblock, "signal 33"}, /* SIGSETXID; see issues 3871, 9400, 12498 */
45-
/* 34 */ {_SigNotify, "signal 34"},
45+
/* 34 */ {_SigSetStack + _SigUnblock, "signal 34"}, /* musl SIGSYNCCALL; see issue 39343 */
4646
/* 35 */ {_SigNotify, "signal 35"},
4747
/* 36 */ {_SigNotify, "signal 36"},
4848
/* 37 */ {_SigNotify, "signal 37"},

0 commit comments

Comments
 (0)