Fix File to Close

hang.jiang · cyphar · commit 506552a88bd3 · 2024-01-24T00:10:57.000+11:00
(This is a cherry-pick of 937ca10.) Signed-off-by: hang.jiang <hang.jiang@daocloud.io> Fixes: GHSA-xr7r-f8xq-vfvv CVE-2024-21626 Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
diff --git a/libcontainer/cgroups/fs/paths.go b/libcontainer/cgroups/fs/paths.go
@@ -83,6 +83,7 @@ func tryDefaultCgroupRoot() string {
 	if err != nil {
 		return ""
 	}
+	defer dir.Close()
 	names, err := dir.Readdirnames(1)
 	if err != nil {
 		return ""
diff --git a/update.go b/update.go
@@ -174,6 +174,7 @@ other options are ignored.
 				if err != nil {
 					return err
 				}
+				defer f.Close()
 			}
 			err = json.NewDecoder(f).Decode(&r)
 			if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ func tryDefaultCgroupRoot() string {`
`83`	`83`	`if err != nil {`
`84`	`84`	`return ""`
`85`	`85`	`}`
	`86`	`+ defer dir.Close()`
`86`	`87`	`names, err := dir.Readdirnames(1)`
`87`	`88`	`if err != nil {`
`88`	`89`	`return ""`
Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,7 @@ other options are ignored.`
`174`	`174`	`if err != nil {`
`175`	`175`	`return err`
`176`	`176`	`}`
	`177`	`+ defer f.Close()`
`177`	`178`	`}`
`178`	`179`	`err = json.NewDecoder(f).Decode(&r)`
`179`	`180`	`if err != nil {`