archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8272124: Cgroup v1 initialization causes NullPointerException when cgroup path contains colon

Browse source 
Reviewed-by: mseledtsov, sgehwolf
This commit is contained in:
Harold Seigel 2021-08-18 14:24:58 +00:00
parent 30b0f820ce
commit 4d6593ce02
2 changed files with 57 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemFactory.java
View file

@ -196,9 +196,10 @@ public class CgroupSubsystemFactory {
if (isCgroupsV2) {
action = (tokens -> setCgroupV2Path(infos, tokens));
}
selfCgroupLines.map(line -> line.split(":"))
.filter(tokens -> (tokens.length >= 3))
.forEach(action);
// The limit value of 3 is because /proc/self/cgroup contains three
// colon-separated tokens per line. The last token, cgroup path, might
// contain a ':'.
selfCgroupLines.map(line -> line.split(":", 3)).forEach(action);
}
CgroupTypeResult result = new CgroupTypeResult(isCgroupsV2,