Merge branch 'main' into fix-cgroup-path

Signed-off-by: Tianyang Zhang <burning9699@gmail.com>
opencontainers · Oct 31, 2023 · 82842b3 · 82842b3
2 parents 79e0ea4 + ef1166a
commit 82842b3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/libcontainer/cgroups/file.go b/libcontainer/cgroups/file.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/opencontainers/runc/libcontainer/utils"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 )
@@ -111,7 +112,7 @@ func openFile(dir, file string, flags int) (*os.File, error) {
 		flags |= os.O_TRUNC | os.O_CREATE
 		mode = 0o600
 	}
-	path := path.Join(dir, file)
+	path := path.Join(dir, utils.CleanPath(file))
 	if prepareOpenat2() != nil {
 		return openFallback(path, flags, mode)
 	}