Merge pull request containers#6823 from giuseppe/allow-cgroup-with-co…

…lumn-name utils: fix parsing of cgroup with : in the name
mheon · Jun 30, 2020 · 1a1e3f4 · 1a1e3f4
2 parents 6fbd157 + f54408b
commit 1a1e3f4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/utils/utils_supported.go b/utils/utils_supported.go
@@ -64,7 +64,7 @@ func getCgroupProcess(procFile string) (string, error) {
 	cgroup := "/"
 	for scanner.Scan() {
 		line := scanner.Text()
-		parts := strings.Split(line, ":")
+		parts := strings.SplitN(line, ":", 3)
 		if len(parts) != 3 {
 			return "", errors.Errorf("cannot parse cgroup line %q", line)
 		}
@@ -116,7 +116,7 @@ func MoveUnderCgroupSubtree(subtree string) error {
 	scanner := bufio.NewScanner(f)
 	for scanner.Scan() {
 		line := scanner.Text()
-		parts := strings.Split(line, ":")
+		parts := strings.SplitN(line, ":", 3)
 		if len(parts) != 3 {
 			return errors.Errorf("cannot parse cgroup line %q", line)
 		}