[sys] linux: fix last argument of pselect6

Gerrit Bot (Gerrit)

unread,

Jul 16, 2023, 2:14:33 PM7/16/23

to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com

Attention is currently required from:

Gerrit Bot has uploaded this change for review.

linux: fix last argument of pselect6

On Linux, the last argument of pselect6 system call is **not** a sigseg_t * pointer, but instead it is a structure of the form:

    struct {
        const sigset_t *ss;     /* Pointer to signal set */
        size_t          ss_len; /* Size (in bytes) of object pointed
    };

See man 2 pselect6.

Fixes #61251

Change-Id: Id0aa122a77796713bc6d624dc395d396fbc0c5e2
GitHub-Last-Rev: 3c1041b1cfd17a1c60a33991521f7acd8ba0d786
GitHub-Pull-Request: golang/sys#167
---
M unix/linux/types.go
M unix/syscall_linux.go
M unix/syscall_linux_test.go
M unix/zsyscall_linux.go
M unix/ztypes_linux.go
5 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/unix/linux/types.go b/unix/linux/types.go
index 469ff6b..1902573 100644
--- a/unix/linux/types.go
+++ b/unix/linux/types.go
@@ -968,6 +968,10 @@
 )
 
 type Sigset_t C.sigset_t
+type pselect6Sigset_t struct {
+	ss    *Sigset_t
+	ssLen uintptr // Size (in bytes) of object pointed to by ss.
+}
 
 const _C__NSIG = C._NSIG
 
diff --git a/unix/syscall_linux.go b/unix/syscall_linux.go
index 332a74b..e296688 100644
--- a/unix/syscall_linux.go
+++ b/unix/syscall_linux.go
@@ -1885,7 +1885,7 @@
 //sys	PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error)
 //sys	PivotRoot(newroot string, putold string) (err error) = SYS_PIVOT_ROOT
 //sys	Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error)
-//sys	Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) = SYS_PSELECT6
+//sys	pselect6(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *pselect6Sigset_t) (n int, err error)
 //sys	read(fd int, p []byte) (n int, err error)
 //sys	Removexattr(path string, attr string) (err error)
 //sys	Renameat2(olddirfd int, oldpath string, newdirfd int, newpath string, flags uint) (err error)
@@ -2438,6 +2438,36 @@
 	return int(r), int(e), int(s)
 }
 
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	// Per https://man7.org/linux/man-pages/man2/select.2.html#NOTES,
+	// The Linux pselect6() system call modifies its timeout argument.
+	// [Not modifying the argument] is the behavior required by POSIX.1-2001.
+	var mutableTimeout *Timespec
+	if timeout != nil {
+		mutableTimeout = new(Timespec)
+		*mutableTimeout = *timeout
+	}
+
+	// The final argument of the pselect6() system call is not a
+	// sigset_t * pointer, but is instead a structure
+	var kernelMask *pselect6Sigset_t
+	if sigmask != nil {
+		wordBits := 32 << (^uintptr(0) >> 63)
+		sigsetWords := (_C__NSIG - 1 + wordBits - 1) / (wordBits)
+
+		// A sigset stores one bit per signal,
+		// offset by 1 (because signal 0 does not exist).
+		// So the number of words needed is ⌈__C_NSIG - 1 / wordBits⌉.
+		sigsetBytes := sigsetWords * (wordBits / 8)
+		kernelMask = &pselect6Sigset_t{
+			ss:    sigmask,
+			ssLen: uintptr(sigsetBytes),
+		}
+	}
+
+	return pselect6(nfd, r, w, e, mutableTimeout, kernelMask)
+}
+
 /*
  * Unimplemented
  */
diff --git a/unix/syscall_linux_test.go b/unix/syscall_linux_test.go
index 2787fe5..b854811 100644
--- a/unix/syscall_linux_test.go
+++ b/unix/syscall_linux_test.go
@@ -444,6 +444,40 @@
 	}
 }
 
+func TestPselectWithSigmask(t *testing.T) {
+	var sigmask unix.Sigset_t
+	sigmask.Val[0] |= 1 << (uint(unix.SIGUSR1) - 1)
+	for {
+		n, err := unix.Pselect(0, nil, nil, nil, &unix.Timespec{Sec: 0, Nsec: 0}, &sigmask)
+		if err == unix.EINTR {
+			t.Logf("Pselect interrupted")
+			continue
+		} else if err != nil {
+			t.Fatalf("Pselect: %v", err)
+		}
+		if n != 0 {
+			t.Fatalf("Pselect: got %v ready file descriptors, expected 0", n)
+		}
+		break
+	}
+
+	for {
+		var sigmask unix.Sigset_t
+		sigmask.Val[0] |= 1 << (uint(unix.SIGUSR1) - 1)
+		n, err := unix.Pselect(0, nil, nil, nil, &unix.Timespec{Sec: 0, Nsec: 0}, &sigmask)
+		if err == unix.EINTR {
+			t.Logf("Pselect interrupted")
+			continue
+		} else if err != nil {
+			t.Fatalf("Pselect: %v", err)
+		}
+		if n != 0 {
+			t.Fatalf("Pselect: got %v ready file descriptors, expected 0", n)
+		}
+		break
+	}
+}
+
 func TestSchedSetaffinity(t *testing.T) {
 	var newMask unix.CPUSet
 	newMask.Zero()
diff --git a/unix/zsyscall_linux.go b/unix/zsyscall_linux.go
index 7ceec23..44e033a 100644
--- a/unix/zsyscall_linux.go
+++ b/unix/zsyscall_linux.go
@@ -1356,7 +1356,7 @@
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+func pselect6(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *pselect6Sigset_t) (n int, err error) {
 	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
 	n = int(r0)
 	if e1 != 0 {
diff --git a/unix/ztypes_linux.go b/unix/ztypes_linux.go
index 02e2462..69f3eec 100644
--- a/unix/ztypes_linux.go
+++ b/unix/ztypes_linux.go
@@ -866,6 +866,11 @@
 	POLLNVAL = 0x20
 )
 
+type pselect6Sigset_t struct {
+	ss    *Sigset_t
+	ssLen uintptr
+}
+
 type SignalfdSiginfo struct {
 	Signo     uint32
 	Errno     int32

To view, visit change 510195. To unsubscribe, or for help writing mail filters, visit settings.

Gopher Robot (Gerrit)

unread,

Jul 16, 2023, 2:15:25 PM7/16/23

to Gerrit Bot, goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com

Attention is currently required from:

Congratulations on opening your first change. Thank you for your contribution!

Next steps:
A maintainer will review your change and provide feedback. See
https://go.dev/doc/contribute#review for more info and tips to get your
patch through code review.

Most changes in the Go project go through a few rounds of revision. This can be
surprising to people new to the project. The careful, iterative review process
is our way of helping mentor contributors and ensuring that their contributions
have a lasting impact.

During May-July and Nov-Jan the Go project is in a code freeze, during which
little code gets reviewed or merged. If a reviewer responds with a comment like
R=go1.11 or adds a tag like "wait-release", it means that this CL will be
reviewed as part of the next development cycle. See https://go.dev/s/release
for more details.

[sys] linux: fix last argument of pselect6

Gerrit Bot (Gerrit)

Gopher Robot (Gerrit)

Jesse Rittner (Gerrit)

Gerrit Bot (Gerrit)

Bryan Mills (Gerrit)

Gerrit Bot (Gerrit)

Ian Lance Taylor (Gerrit)

Bryan Mills (Gerrit)

Mauri de Souza Meneguzzo (Gerrit)

Mauri de Souza Meneguzzo (Gerrit)

Gerrit Bot (Gerrit)

Mauri de Souza Meneguzzo (Gerrit)

Gerrit Bot (Gerrit)

Mauri de Souza Meneguzzo (Gerrit)

Gerrit Bot (Gerrit)

Mauri de Souza Meneguzzo (Gerrit)

Mauri de Souza Meneguzzo (Gerrit)

Gerrit Bot (Gerrit)

Ian Lance Taylor (Gerrit)

Ian Lance Taylor (Gerrit)

Gopher Robot (Gerrit)