mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

libcontainer: if close_range fails, fall back to the old way

Browse Source 
Signed-off-by: Evan Phoenix <evan@phx.io>
This commit is contained in:
Evan Phoenix
2025-01-24 11:54:37 -08:00
parent 111e8dcc0d
commit 33315a0548
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/utils/utils_unix.go
+7 -1
View File
@@ -103,7 +103,13 @@ func CloseExecFrom(minFd int) error {
// Use close_range(CLOSE_RANGE_CLOEXEC) if possible. // Use close_range(CLOSE_RANGE_CLOEXEC) if possible.
if haveCloseRangeCloexec() { if haveCloseRangeCloexec() {
err := unix.CloseRange(uint(minFd), math.MaxInt32, unix.CLOSE_RANGE_CLOEXEC) err := unix.CloseRange(uint(minFd), math.MaxInt32, unix.CLOSE_RANGE_CLOEXEC)
return os.NewSyscallError("close_range", err) if err == nil {
return nil
}
logrus.Debugf("close_range failed, closing range one at a time (error: %v)", err)
// If close_range fails, we fall back to the standard loop.
} }
// Otherwise, fall back to the standard loop. // Otherwise, fall back to the standard loop.
return fdRangeFrom(minFd, unix.CloseOnExec) return fdRangeFrom(minFd, unix.CloseOnExec)