diff --git a/go.mod b/go.mod index 81d4cdef96..741ba4bc01 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( github.com/nxadm/tail v1.4.11 github.com/onsi/ginkgo/v2 v2.32.1 github.com/onsi/gomega v1.42.1 - github.com/opencontainers/cgroups v0.0.8 + github.com/opencontainers/cgroups v0.0.9 github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.1.1 github.com/opencontainers/runtime-spec v1.3.0 diff --git a/go.sum b/go.sum index 702668e25b..182be66180 100644 --- a/go.sum +++ b/go.sum @@ -285,8 +285,8 @@ github.com/onsi/ginkgo/v2 v2.32.1 h1:6tlvcDm/3sE8lGJbZ4+d4mO3RLy24/tQWOFzVSQNIfw github.com/onsi/ginkgo/v2 v2.32.1/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44= github.com/onsi/gomega v1.42.1 h1:iN1rCUX+44NZ1Dc97MPoeFYbFR0vh8zxoxMFwKdyZ6I= github.com/onsi/gomega v1.42.1/go.mod h1:REff/hsDsodHoKlWsP2mAPhu1+5/6hVYNf9rIEBpeSg= -github.com/opencontainers/cgroups v0.0.8 h1:dQZyCsB73ggKJUzNl4FLbpvArrLv1tLOjMYPHswdUrI= -github.com/opencontainers/cgroups v0.0.8/go.mod h1:hPBRvnBhLZueEN0eJyozMeM3HeFGYlZW9KnO//px6G4= +github.com/opencontainers/cgroups v0.0.9 h1:zHNGu6y7rGnbm8vqK92ZgOYNARcZ7XvnBobA5BOUkzE= +github.com/opencontainers/cgroups v0.0.9/go.mod h1:hPBRvnBhLZueEN0eJyozMeM3HeFGYlZW9KnO//px6G4= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040= diff --git a/vendor/github.com/opencontainers/cgroups/.golangci.yml b/vendor/github.com/opencontainers/cgroups/.golangci.yml index 90799883ca..69e86061d6 100644 --- a/vendor/github.com/opencontainers/cgroups/.golangci.yml +++ b/vendor/github.com/opencontainers/cgroups/.golangci.yml @@ -10,6 +10,8 @@ formatters: linters: enable: - errorlint + - govet + - modernize - nolintlint - unconvert - unparam diff --git a/vendor/github.com/opencontainers/cgroups/fs2/fs2.go b/vendor/github.com/opencontainers/cgroups/fs2/fs2.go index 46819a8f4d..710fb4f3fe 100644 --- a/vendor/github.com/opencontainers/cgroups/fs2/fs2.go +++ b/vendor/github.com/opencontainers/cgroups/fs2/fs2.go @@ -89,7 +89,8 @@ func (m *Manager) Apply(pid int) error { // a cgroup under under the manager's cgroup. func (m *Manager) AddPid(subcgroup string, pid int) error { path := filepath.Join(m.dirPath, subcgroup) - if !strings.HasPrefix(path, m.dirPath) { + // Make sure path is either m.dirPath itself or below it. + if path != m.dirPath && !strings.HasPrefix(path, m.dirPath+"/") { return fmt.Errorf("bad sub cgroup path: %s", subcgroup) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 577fca2daf..5a56bb8a59 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -517,7 +517,7 @@ github.com/onsi/gomega/matchers/support/goraph/edge github.com/onsi/gomega/matchers/support/goraph/node github.com/onsi/gomega/matchers/support/goraph/util github.com/onsi/gomega/types -# github.com/opencontainers/cgroups v0.0.8 +# github.com/opencontainers/cgroups v0.0.9 ## explicit; go 1.24.0 github.com/opencontainers/cgroups github.com/opencontainers/cgroups/devices/config