diff --git a/go.mod b/go.mod index 8812eefcb4e..adcadc8ab4a 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/moby/sys/devices v0.1.0 github.com/moby/sys/mountinfo v0.7.2 github.com/moby/sys/user v0.4.1 - github.com/moby/sys/userns v0.2.0 + github.com/moby/sys/userns v0.2.1 github.com/mrunalp/fileutils v0.5.1 github.com/opencontainers/cgroups v0.1.0 github.com/opencontainers/runtime-spec v1.3.0 diff --git a/go.sum b/go.sum index 05e09e76a47..99896def514 100644 --- a/go.sum +++ b/go.sum @@ -32,8 +32,8 @@ github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9Kou github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4= github.com/moby/sys/user v0.4.1 h1:RgjRlaDKi/Xmyrz4t8lyzXT6v2ooFeO/7xtchmhVWE0= github.com/moby/sys/user v0.4.1/go.mod h1:E9QsW5WRe1kUAf7kW8hXKwu1uhsZEAdPLYHYSDudF4Y= -github.com/moby/sys/userns v0.2.0 h1:nEtDtp7NCV/6dutSklNe8FrENPwFdc4mXnZqC/JWgXM= -github.com/moby/sys/userns v0.2.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28= +github.com/moby/sys/userns v0.2.1 h1:4OvdM7BcPkASbuouHsbW3aeMJSFlYDldBRnXVZhaRk8= +github.com/moby/sys/userns v0.2.1/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28= github.com/mrunalp/fileutils v0.5.1 h1:F+S7ZlNKnrwHfSwdlgNSkKo67ReVf8o9fel6C3dkm/Q= github.com/mrunalp/fileutils v0.5.1/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/opencontainers/cgroups v0.1.0 h1:6W05KiDvgj1yi/6D13SJCvYx8TAESz67szvHPxhfcrs= diff --git a/vendor/github.com/moby/sys/userns/userns_linux.go b/vendor/github.com/moby/sys/userns/userns_linux.go index b4288edcdf9..8a2e353272d 100644 --- a/vendor/github.com/moby/sys/userns/userns_linux.go +++ b/vendor/github.com/moby/sys/userns/userns_linux.go @@ -2,6 +2,7 @@ package userns import ( "bufio" + "errors" "fmt" "os" "sync" @@ -23,7 +24,16 @@ var inUserNS = sync.OnceValue(runningInUserNS) func runningInUserNS() bool { var st syscall.Stat_t if err := syscall.Stat("/proc/self/ns/user", &st); err == nil { - return st.Ino != procUserInitIno + // The kernel's initial user namespace inode is definitive when it + // matches. OpenVZ virtualizes namespace inode numbers, so a mismatch + // must fall back to uid_map-based detection there. + if st.Ino == procUserInitIno { + return false + } + if runningInOpenVZ() { + return runningInUserNSFromUIDMap() + } + return true } else if !os.IsNotExist(err) { // As long as /proc/self/ns/user exists, we are on a modern kernel. // Other errors indicate an unexpected procfs state, where assuming the @@ -35,6 +45,10 @@ func runningInUserNS() bool { // through procfs at /proc/self/ns/user. // TODO: Remove this fallback once Linux kernels older than 3.8 are no // longer supported. + return runningInUserNSFromUIDMap() +} + +func runningInUserNSFromUIDMap() bool { file, err := os.Open("/proc/self/uid_map") if err != nil { // This kernel-provided file only exists if user namespaces are supported. @@ -69,3 +83,19 @@ func uidMapInUserNS(uidMap string) bool { initNS := a == 0 && b == 0 && c == 4294967295 return !initNS } + +// runningInOpenVZ reports whether the process is running inside an OpenVZ +// container. +// +// OpenVZ exposes /proc/vz both on the host and inside containers, while +// /proc/bc is only exposed on the host. This follows systemd's OpenVZ +// detection: +// https://github.com/systemd/systemd/blob/v261.2/src/basic/virt.c#L642-L653 +func runningInOpenVZ() bool { + var st syscall.Stat_t + if err := syscall.Stat("/proc/vz", &st); err != nil { + return false + } + err := syscall.Stat("/proc/bc", &st) + return errors.Is(err, syscall.ENOENT) +} diff --git a/vendor/modules.txt b/vendor/modules.txt index a2a21487ee5..61d16000c1d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -58,7 +58,7 @@ github.com/moby/sys/mountinfo # github.com/moby/sys/user v0.4.1 ## explicit; go 1.18 github.com/moby/sys/user -# github.com/moby/sys/userns v0.2.0 +# github.com/moby/sys/userns v0.2.1 ## explicit; go 1.21 github.com/moby/sys/userns # github.com/mrunalp/fileutils v0.5.1