github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #10060 from dcantah/unix-waitid

Browse Source 
Replace direct waitid syscall with unix.Waitid
This commit is contained in:
Phil Estes 2024-04-10 16:48:12 +00:00 committed by GitHub
commit 2adae6093e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/mount/mount_idmapped_linux.go
View File

@ -190,17 +190,13 @@ func getUsernsFD(uidMaps, gidMaps []syscall.SysProcIDMap) (_usernsFD *os.File, r
} }
func pidfdWaitid(pidFD *os.File) error { func pidfdWaitid(pidFD *os.File) error {
// https://elixir.bootlin.com/linux/v5.4.258/source/include/uapi/linux/wait.h#L20
const PPidFD = 3
var e syscall.Errno
for { for {
_, _, e = syscall.Syscall6(syscall.SYS_WAITID, PPidFD, pidFD.Fd(), 0, syscall.WEXITED, 0, 0) err := unix.Waitid(unix.P_PIDFD, int(pidFD.Fd()), nil, unix.WEXITED, nil)
if e != syscall.EINTR { if err == unix.EINTR {
break continue
} }
return err
} }
return e
} }
var ( var (