containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cgroups: use filepath.Join 

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2024-09-11 10:36:13 +02:00
parent e4f792bc24
commit 0159020c0f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/pkg/cgroups/cgroups_linux.go
View File

@ -95,7 +95,8 @@ func init() {
func getAvailableControllers(exclude map[string]controllerHandler, cgroup2 bool) ([]controller, error) {
if cgroup2 {
controllers := []controller{}
controllersFile := cgroupRoot + "/cgroup.controllers"
controllersFile := filepath.Join(cgroupRoot, "cgroup.controllers")
// rootless cgroupv2: check available controllers for current user, systemd or servicescope will inherit
if unshare.IsRootless() {
userSlice, err := getCgroupPathForCurrentProcess()
@ -104,7 +105,7 @@ func getAvailableControllers(exclude map[string]controllerHandler, cgroup2 bool)
}
// userSlice already contains '/' so not adding here
basePath := cgroupRoot + userSlice
controllersFile = basePath + "/cgroup.controllers"
controllersFile = filepath.Join(basePath, "cgroup.controllers")
}
controllersFileBytes, err := os.ReadFile(controllersFile)
if err != nil {
@ -597,7 +598,7 @@ func createCgroupv2Path(path string) (deferredError error) {
if !strings.HasPrefix(path, cgroupRoot+"/") {
return fmt.Errorf("invalid cgroup path %s", path)
}
content, err := os.ReadFile(cgroupRoot + "/cgroup.controllers")
content, err := os.ReadFile(filepath.Join(cgroupRoot, "cgroup.controllers"))
if err != nil {
return err
}